From b02904597b68f4e90be7e107a0291115679957b3 Mon Sep 17 00:00:00 2001 From: Fawzi Mohamed Date: Thu, 4 Dec 2014 13:19:42 +0100 Subject: qmljs: lookup libraries in the correct place MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This lead some libraries to be “lost”, typically QtQuick Change-Id: I44e8fd12f53ce1371a2d4bd094fe5b67cad30676 Reviewed-by: Tim Jenssen Reviewed-by: Eike Ziller --- src/libs/qmljs/qmljsmodelmanagerinterface.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); } -- cgit v1.2.1