summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFawzi Mohamed <fawzi.mohamed@theqtcompany.com>2014-12-04 13:19:42 +0100
committerEike Ziller <eike.ziller@theqtcompany.com>2014-12-04 13:36:28 +0100
commitb02904597b68f4e90be7e107a0291115679957b3 (patch)
tree0625ae0b2ecff46c2fb60e05c6beed81a6ddc8d0
parentdffd2866b3a5bc5b0f2003073764943c8ff485e6 (diff)
downloadqt-creator-b02904597b68f4e90be7e107a0291115679957b3.tar.gz
qmljs: lookup libraries in the correct place
This lead some libraries to be “lost”, typically QtQuick Change-Id: I44e8fd12f53ce1371a2d4bd094fe5b67cad30676 Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
-rw-r--r--src/libs/qmljs/qmljsmodelmanagerinterface.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libs/qmljs/qmljsmodelmanagerinterface.cpp b/src/libs/qmljs/qmljsmodelmanagerinterface.cpp
index 64b2a4331d..e984fdd449 100644
--- a/src/libs/qmljs/qmljsmodelmanagerinterface.cpp
+++ b/src/libs/qmljs/qmljsmodelmanagerinterface.cpp
@@ -847,7 +847,7 @@ static void findNewLibraryImports(const Document::Ptr &doc, const Snapshot &snap
if (!import.version().isValid())
continue;
foreach (const PathAndLanguage &importPath, importPaths) {
- const QString targetPath = importPath.path().toFileInfo().dir().filePath(import.path());
+ const QString targetPath = importPath.path().appendPath(import.path()).toString();
findNewQmlLibrary(targetPath, import.version(), snapshot, modelManager,
importedFiles, scannedPaths, newLibraries);
}