From: Christian Kamm <christian.d.kamm@nokia.com>
Date: Mon, 4 Oct 2010 09:56:10 +0000 (+0200)
Subject: Debugging helpers: Only build qmldump/qmlobserver for desktop targets.
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a5c7d465abec73fc2e01684957679682ccf2bb09;p=qt-creator-jp%2Fqt-creator-jp.git

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 e39956b8a1..eac0415f92 100644
--- 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 e444d89bbb..f2b55cbac6 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 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)