From 8f85202fb1153069f0991caaee9d0f9ede22eb0c Mon Sep 17 00:00:00 2001
From: Christian Kamm <christian.d.kamm@nokia.com>
Date: Fri, 12 Nov 2010 13:37:54 +0100
Subject: [PATCH] QmlProject and Observer: Work with Simulator Qt targets.
This allows using the qmlviewer of a Simulator Qt version. It also
builds and uses the qmlobserver when debugging.
Reviewed-by: Kai Koehne
---
src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp | 3 ++-
src/plugins/qt4projectmanager/qmlobservertool.cpp | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
index bb8c8db76c8..4c28260adc7 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
@@ -473,7 +473,8 @@ void QmlProjectRunConfiguration::manageQtVersions()
bool QmlProjectRunConfiguration::isValidVersion(Qt4ProjectManager::QtVersion *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()) {
return true;
}
diff --git a/src/plugins/qt4projectmanager/qmlobservertool.cpp b/src/plugins/qt4projectmanager/qmlobservertool.cpp
index 5d5bbdf8fb7..838a5f5452b 100644
--- a/src/plugins/qt4projectmanager/qmlobservertool.cpp
+++ b/src/plugins/qt4projectmanager/qmlobservertool.cpp
@@ -53,7 +53,8 @@ static inline QStringList validBinaryFilenames()
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);
}
--
GitLab