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

qmldump: Ensure path and environment are taken from the same Qt version.

Browse Source 
Fixes f1fb0bddb1.

Reviewed-by: Kai Koehne
This commit is contained in:
Christian Kamm
2010-10-26 16:29:46 +02:00
parent f1fb0bddb1
commit 528999d549
4 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/qt4projectmanager/qt4project.cpp
View File

@@ -597,10 +597,9 @@ void Qt4Project::updateQmlJSCodeModel()
const QString qtVersionImportPath = qtVersion->versionInfo().value("QT_INSTALL_IMPORTS");
if (!qtVersionImportPath.isEmpty())
projectInfo.importPaths += qtVersionImportPath;
projectInfo.qmlDumpEnvironment = qtVersion->qmlToolsEnvironment();
projectInfo.qmlDumpPath = QmlDumpTool::qmlDumpPath(this);
}
}
QmlDumpTool::pathAndEnvironment(this, &projectInfo.qmlDumpPath, &projectInfo.qmlDumpEnvironment);
projectInfo.importPaths.removeDuplicates();
modelManager->updateProjectInfo(projectInfo);