feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

qmljs: lookup libraries in the correct place

Browse Source 
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>
This commit is contained in:
Fawzi Mohamed
2014-12-04 13:19:42 +01:00
committed by Eike Ziller
parent dffd2866b3
commit b02904597b
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/qmljs/qmljsmodelmanagerinterface.cpp
View File

@@ -847,7 +847,7 @@ static void findNewLibraryImports(const Document::Ptr &doc, const Snapshot &snap
if (!import.version().isValid()) if (!import.version().isValid())
continue; continue;
foreach (const PathAndLanguage &importPath, importPaths) { 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, findNewQmlLibrary(targetPath, import.version(), snapshot, modelManager,
importedFiles, scannedPaths, newLibraries); importedFiles, scannedPaths, newLibraries);
} }