OSDN Git Service

QtOptionsPage: Don't build qml helpers for 4.8
authorKai Koehne <kai.koehne@nokia.com>
Wed, 19 Oct 2011 10:36:06 +0000 (12:36 +0200)
committerKai Koehne <kai.koehne@nokia.com>
Wed, 19 Oct 2011 11:34:35 +0000 (13:34 +0200)
They're not required any more.

Change-Id: If55d835600ea0ddf6b6b54f8fdd88e2025fc17be
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
src/plugins/qtsupport/qmldebugginglibrary.cpp
src/plugins/qtsupport/qmldumptool.cpp
src/plugins/qtsupport/qmlobservertool.cpp

index cff3af7..3e42301 100644 (file)
@@ -73,6 +73,11 @@ bool QmlDebuggingLibrary::canBuild(const BaseQtVersion *qtVersion, QString *reas
             *reason = QCoreApplication::translate("Qt4ProjectManager::QmlDebuggingLibrary", "Only available for Qt 4.7.1 or newer.");
         return false;
     }
+    if (qtVersion->qtVersion() >= QtVersionNumber(4, 8, 0)) {
+        if (reason)
+            *reason = QCoreApplication::translate("Qt4ProjectManager::QmlDebuggingLibrary", "Not needed.");
+        return false;
+    }
     return true;
 }
 
index ec8f8e2..93d2e6c 100644 (file)
@@ -209,6 +209,12 @@ bool QmlDumpTool::canBuild(const BaseQtVersion *qtVersion, QString *reason)
             *reason = QCoreApplication::translate("Qt4ProjectManager::QmlDumpTool", "Only available for Qt 4.7.1 or newer.");
         return false;
     }
+    if (qtVersion->qtVersion() >= QtVersionNumber(4, 8, 0)) {
+        if (reason)
+            *reason = QCoreApplication::translate("Qt4ProjectManager::QmlDumpTool", "Not needed.");
+        return false;
+    }
+
 
     if (!hasPrivateHeaders(installHeaders)) {
         if (reason)
index 1eb16ca..c114e7c 100644 (file)
@@ -68,6 +68,11 @@ bool QmlObserverTool::canBuild(const BaseQtVersion *qtVersion, QString *reason)
             *reason = QCoreApplication::translate("Qt4ProjectManager::QmlObserverTool", "Only available for Qt 4.7.1 or newer.");
         return false;
     }
+    if (qtVersion->qtVersion() >= QtVersionNumber(4, 8, 0)) {
+        if (reason)
+            *reason = QCoreApplication::translate("Qt4ProjectManager::QmlObserverTool", "Not needed.");
+        return false;
+    }
     return true;
 }