From c652d3ba637a5edaf345f53b8a2880e1cb46e985 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Wed, 19 Oct 2011 12:36:06 +0200 Subject: [PATCH] QtOptionsPage: Don't build qml helpers for 4.8 They're not required any more. Change-Id: If55d835600ea0ddf6b6b54f8fdd88e2025fc17be Reviewed-by: Christian Kamm Reviewed-by: Daniel Teske --- src/plugins/qtsupport/qmldebugginglibrary.cpp | 5 +++++ src/plugins/qtsupport/qmldumptool.cpp | 6 ++++++ src/plugins/qtsupport/qmlobservertool.cpp | 5 +++++ 3 files changed, 16 insertions(+) diff --git a/src/plugins/qtsupport/qmldebugginglibrary.cpp b/src/plugins/qtsupport/qmldebugginglibrary.cpp index cff3af70f9..3e42301e0c 100644 --- a/src/plugins/qtsupport/qmldebugginglibrary.cpp +++ b/src/plugins/qtsupport/qmldebugginglibrary.cpp @@ -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; } diff --git a/src/plugins/qtsupport/qmldumptool.cpp b/src/plugins/qtsupport/qmldumptool.cpp index ec8f8e247f..93d2e6c220 100644 --- a/src/plugins/qtsupport/qmldumptool.cpp +++ b/src/plugins/qtsupport/qmldumptool.cpp @@ -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) diff --git a/src/plugins/qtsupport/qmlobservertool.cpp b/src/plugins/qtsupport/qmlobservertool.cpp index 1eb16ca27d..c114e7cc1c 100644 --- a/src/plugins/qtsupport/qmlobservertool.cpp +++ b/src/plugins/qtsupport/qmlobservertool.cpp @@ -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; } -- 2.11.0