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

QmlDump: Get right Qt version for .qmlproject

Browse Source 
We're using a QObject property to get the Qt Version Id: QmlDumpTool
is in Qt4ProjectManager, which shouldn't have a dependency to QmlProjectManager.

Reviewed-by: Christian Kamm
This commit is contained in:
Kai Koehne
2010-10-06 10:03:51 +02:00
parent 1d3c08dabb
commit f5716f05b7
3 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
View File

@@ -67,6 +67,7 @@ QmlProjectRunConfiguration::QmlProjectRunConfiguration(Internal::QmlProjectTarge
m_isEnabled(false)
{
ctor();
updateQtVersions();
}
QmlProjectRunConfiguration::QmlProjectRunConfiguration(Internal::QmlProjectTarget *parent, QmlProjectRunConfiguration *source) :
@@ -78,6 +79,7 @@ QmlProjectRunConfiguration::QmlProjectRunConfiguration(Internal::QmlProjectTarge
{
ctor();
setMainScript(source->m_scriptFile);
updateQtVersions();
}
bool QmlProjectRunConfiguration::isEnabled(ProjectExplorer::BuildConfiguration *bc) const
@@ -158,6 +160,11 @@ QString QmlProjectRunConfiguration::workingDirectory() const
return projectFile.absolutePath();
}
int QmlProjectRunConfiguration::qtVersionId() const
{
return m_qtVersionId;
}
Qt4ProjectManager::QtVersion *QmlProjectRunConfiguration::qtVersion() const
{
if (m_qtVersionId == -1)