diff options
| author | Fawzi Mohamed <fawzi.mohamed@digia.com> | 2014-11-26 17:07:45 +0100 |
|---|---|---|
| committer | Fawzi Mohamed <fawzi.mohamed@theqtcompany.com> | 2014-11-26 17:34:36 +0100 |
| commit | 9b0bdf981f5d81a004062cfbe308e75c64b3f186 (patch) | |
| tree | 6104eca8c0352879aa7628b0e08848b56f7a1eea | |
| parent | d927a80f2b5b41643f244715214b9d9eee4abc4d (diff) | |
| download | qt-creator-9b0bdf981f5d81a004062cfbe308e75c64b3f186.tar.gz | |
qmljs: fix library path for builtins
Change-Id: Ie43f7a3241ae8d253853a0b38781774a70cb6897
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@theqtcompany.com>
| -rw-r--r-- | src/libs/qmljs/qmljsplugindumper.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libs/qmljs/qmljsplugindumper.cpp b/src/libs/qmljs/qmljsplugindumper.cpp index 63ad5f40ff..1642d9d024 100644 --- a/src/libs/qmljs/qmljsplugindumper.cpp +++ b/src/libs/qmljs/qmljsplugindumper.cpp @@ -93,10 +93,10 @@ void PluginDumper::scheduleMaybeRedumpBuiltins(const QmlJS::ModelManagerInterfac void PluginDumper::onLoadBuiltinTypes(const QmlJS::ModelManagerInterface::ProjectInfo &info, bool force) { - if (info.qmlDumpPath.isEmpty() || (info.qtImportsPath.isEmpty() && info.qtQmlPath.isEmpty())) + const QString baseImportsPath = info.qtQmlPath.isEmpty() ? info.qtImportsPath : info.qtQmlPath; + if (info.qmlDumpPath.isEmpty() || baseImportsPath.isEmpty()) return; - const QString baseImportsPath = info.qtQmlPath.isEmpty() ? info.qtImportsPath : info.qtQmlPath; const QString importsPath = QDir::cleanPath(baseImportsPath); if (m_runningQmldumps.values().contains(importsPath)) return; @@ -109,7 +109,7 @@ void PluginDumper::onLoadBuiltinTypes(const QmlJS::ModelManagerInterface::Projec return; } builtinInfo = LibraryInfo(LibraryInfo::Found); - m_modelManager->updateLibraryInfo(info.qtImportsPath, builtinInfo); + m_modelManager->updateLibraryInfo(baseImportsPath, builtinInfo); // prefer QTDIR/qml/builtins.qmltypes if available const QString builtinQmltypesPath = baseImportsPath + QLatin1String("/builtins.qmltypes"); |