Merge remote-tracking branch 'origin/2.4'

Conflicts:
	qtcreator.pri
	src/libs/qmljs/qmljscheck.cpp
	src/plugins/debugger/gdb/gdbengine.cpp
	src/plugins/debugger/gdb/remotegdbserveradapter.cpp
	src/plugins/plugins.pro
	src/plugins/projectexplorer/buildmanager.cpp
	src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp

Change-Id: Id2dcebf95b94dc46c1d85908ba1d1378aaf362ac

6 files changed, 26 insertions, 3 deletions

diff --git a/src/plugins/qtsupport/exampleslistmodel.cpp b/src/plugins/qtsupport/exampleslistmodel.cpp
index 7bf47ed1ca..ee143ea0b7 100644
--- a/src/plugins/qtsupport/exampleslistmodel.cpp
+++ b/src/plugins/qtsupport/exampleslistmodel.cpp
@@ -269,14 +269,18 @@ QStringList ExamplesListModel::exampleSources() const
     }
     settings->endArray();
 
+
+    bool anyQtVersionHasExamplesFolder = false;
     if (sources.isEmpty()) {
         // Try to get dir from first Qt Version
         QtVersionManager *versionManager = QtVersionManager::instance();
         foreach (BaseQtVersion *version, versionManager->validVersions()) {
 
             QDir examplesDir(version->examplesPath());
-            if (examplesDir.exists())
+            if (examplesDir.exists()) {
                 sources << examplesDir.entryInfoList(pattern);
+                anyQtVersionHasExamplesFolder = true;
+            }
 
             QDir demosDir(version->demosPath());
             if (demosDir.exists())
@@ -290,7 +294,7 @@ QStringList ExamplesListModel::exampleSources() const
     QString resourceDir = Core::ICore::instance()->resourcePath() + QLatin1String("/welcomescreen/");
 
     // Try Creator-provided XML file only
-    if (sources.isEmpty()) {
+    if (sources.isEmpty() && anyQtVersionHasExamplesFolder) {
         // qDebug() << Q_FUNC_INFO << "falling through to Creator-provided XML file";
         sources << QString(resourceDir + QLatin1String("/examples_fallback.xml"));
     }
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;
 }
 
diff --git a/src/plugins/qtsupport/qtoptionspage.cpp b/src/plugins/qtsupport/qtoptionspage.cpp
index b9bdcc16ab..e6a808a24e 100644
--- a/src/plugins/qtsupport/qtoptionspage.cpp
+++ b/src/plugins/qtsupport/qtoptionspage.cpp
@@ -467,6 +467,9 @@ void QtOptionsPageWidget::buildDebuggingHelper(DebuggingHelperBuildTask::Tools t
     if (index < 0)
         return;
 
+    // remove tools that cannot be build
+    tools &= DebuggingHelperBuildTask::availableTools(currentVersion());
+
     QTreeWidgetItem *item = treeItemForIndex(index);
     QTC_ASSERT(item, return);
 
diff --git a/src/plugins/qtsupport/qtversionmanager.ui b/src/plugins/qtsupport/qtversionmanager.ui
index 8ebf7b8439..0e4389e80e 100644
--- a/src/plugins/qtsupport/qtversionmanager.ui
+++ b/src/plugins/qtsupport/qtversionmanager.ui
@@ -50,7 +50,7 @@
           </size>
          </property>
          <property name="text">
-          <string>Add</string>
+          <string>Add...</string>
          </property>
         </widget>
        </item>