Debugging helpers: Only build qmldump/qmlobserver for desktop targets.

Task-number: QTCREATORBUG-2575
Reviewed-by: Kai Koehne

diff --git a/src/plugins/qt4projectmanager/qmldumptool.cpp b/src/plugins/qt4projectmanager/qmldumptool.cpp
index e39956b..eac0415 100644 (file)
--- a/src/plugins/qt4projectmanager/qmldumptool.cpp
+++ b/src/plugins/qt4projectmanager/qmldumptool.cpp
@@ -130,7 +130,8 @@ bool QmlDumpTool::canBuild(const QtVersion *qtVersion)
 {
     const QString installHeaders = qtVersion->versionInfo().value("QT_INSTALL_HEADERS");
     const QString header = installHeaders + QLatin1String("/QtDeclarative/private/qdeclarativemetatype_p.h");
-    return checkMinimumQtVersion(qtVersion->qtVersionString(), 4, 7, 1) || QFile::exists(header);
+    return qtVersion->supportsTargetId(Constants::DESKTOP_TARGET_ID)
+            && (checkMinimumQtVersion(qtVersion->qtVersionString(), 4, 7, 1) || QFile::exists(header));
 }
 
 static QtVersion *qtVersionForProject(ProjectExplorer::Project *project)

diff --git a/src/plugins/qt4projectmanager/qmlobservertool.cpp b/src/plugins/qt4projectmanager/qmlobservertool.cpp
index e444d89..f2b55cb 100644 (file)
--- 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 checkMinimumQtVersion(qtVersion->qtVersionString(), 4, 7, 1);
+    return qtVersion->supportsTargetId(Constants::DESKTOP_TARGET_ID)
+            && checkMinimumQtVersion(qtVersion->qtVersionString(), 4, 7, 1);
 }
 
 QString QmlObserverTool::toolForProject(ProjectExplorer::Project *project)