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

QmlProject and Observer: Work with Simulator Qt targets.

Browse Source 
This allows using the qmlviewer of a Simulator Qt version. It also
builds and uses the qmlobserver when debugging.

Reviewed-by: Kai Koehne
This commit is contained in:
Christian Kamm
2010-11-12 13:37:54 +01:00
parent 8f70d0e200
commit 8f85202fb1
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -473,7 +473,8 @@ void QmlProjectRunConfiguration::manageQtVersions()
bool QmlProjectRunConfiguration::isValidVersion(Qt4ProjectManager::QtVersion *version) bool QmlProjectRunConfiguration::isValidVersion(Qt4ProjectManager::QtVersion *version)
{ {
if (version if (version
&& version->supportsTargetId(Qt4ProjectManager::Constants::DESKTOP_TARGET_ID) && (version->supportsTargetId(Qt4ProjectManager::Constants::DESKTOP_TARGET_ID)
|| version->supportsTargetId(Qt4ProjectManager::Constants::QT_SIMULATOR_TARGET_ID))
&& !version->qmlviewerCommand().isEmpty()) { && !version->qmlviewerCommand().isEmpty()) {
return true; return true;
} }

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

@@ -53,7 +53,8 @@ static inline QStringList validBinaryFilenames()
bool QmlObserverTool::canBuild(const QtVersion *qtVersion) bool QmlObserverTool::canBuild(const QtVersion *qtVersion)
{ {
return qtVersion->supportsTargetId(Constants::DESKTOP_TARGET_ID) return (qtVersion->supportsTargetId(Constants::DESKTOP_TARGET_ID)
|| qtVersion->supportsTargetId(Constants::QT_SIMULATOR_TARGET_ID))
&& checkMinimumQtVersion(qtVersion->qtVersionString(), 4, 7, 1); && checkMinimumQtVersion(qtVersion->qtVersionString(), 4, 7, 1);
} }