aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/corelib/language/scriptengine.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/corelib/language/scriptengine.cpp')
-rw-r--r--src/lib/corelib/language/scriptengine.cpp13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/lib/corelib/language/scriptengine.cpp b/src/lib/corelib/language/scriptengine.cpp
index 7c531e764..e79ec54d7 100644
--- a/src/lib/corelib/language/scriptengine.cpp
+++ b/src/lib/corelib/language/scriptengine.cpp
@@ -478,19 +478,18 @@ QScriptValue ScriptEngine::js_require(QScriptContext *context, QScriptEngine *qt
return context->throwError(
ScriptEngine::tr("require: internal error. No search paths."));
- const QString uri = moduleName;
if (engine->m_logger.debugEnabled()) {
engine->m_logger.qbsDebug()
- << "[require] loading extension " << uri;
+ << "[require] loading extension " << moduleName;
}
- QString uriAsPath = uri;
- uriAsPath.replace(QLatin1Char('.'), QLatin1Char('/'));
+ QString moduleNameAsPath = moduleName;
+ moduleNameAsPath.replace(QLatin1Char('.'), QLatin1Char('/'));
const QStringList searchPaths = engine->m_extensionSearchPathsStack.top();
- const QString dirPath = findExtensionDir(searchPaths, uriAsPath);
+ const QString dirPath = findExtensionDir(searchPaths, moduleNameAsPath);
if (dirPath.isEmpty()) {
- if (uri.startsWith(QStringLiteral("qbs.")))
- return loadInternalExtension(context, engine, uri);
+ if (moduleName.startsWith(QStringLiteral("qbs.")))
+ return loadInternalExtension(context, engine, moduleName);
} else {
QDirIterator dit(dirPath, StringConstants::jsFileWildcards(),
QDir::Files | QDir::Readable);