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

11
src/plugins/qmlprojectmanager/qmlproject.cpp
View File

@@ -131,16 +131,7 @@ void QmlProject::refresh(RefreshOptions options)
QmlJS::ModelManagerInterface::ProjectInfo pinfo(this);
pinfo.sourceFiles = files();
pinfo.importPaths = importPaths();
pinfo.qmlDumpPath = Qt4ProjectManager::QmlDumpTool::qmlDumpPath(this);
if (activeTarget()) {
if (const QmlProjectRunConfiguration *runConfig =
qobject_cast<QmlProjectRunConfiguration*>(activeTarget()->activeRunConfiguration())) {
if (runConfig->qtVersion()) {
pinfo.qmlDumpEnvironment = runConfig->qtVersion()->qmlToolsEnvironment();
}
}
}
Qt4ProjectManager::QmlDumpTool::pathAndEnvironment(this, &pinfo.qmlDumpPath, &pinfo.qmlDumpEnvironment);
m_modelManager->updateProjectInfo(pinfo);
}