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

2 files changed, 4 insertions, 2 deletions

diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
index bb8c8db76c..4c28260adc 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 5d5bbdf8fb..838a5f5452 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);
 }