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

Debugger/JS Code model: Set environment for QML tools correctly.

Browse Source 
Set complete build environment (MinGW).

Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>

Task-number: QTCREATORBUG-2883
This commit is contained in:
Friedemann Kleint
2010-10-26 15:39:37 +02:00
parent 5cb791d761
commit f1fb0bddb1
8 changed files with 37 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,11 +131,16 @@ void QmlProject::refresh(RefreshOptions options)
QmlJS::ModelManagerInterface::ProjectInfo pinfo(this);
pinfo.sourceFiles = files();
pinfo.importPaths = importPaths();
pinfo.qmlDumpPath = Qt4ProjectManager::QmlDumpTool::qmlDumpPath(this);
if (pinfo.qmlDumpPath.isNull()) {
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();
}
}
}
m_modelManager->updateProjectInfo(pinfo);
}