Fix qbs build.

There was more stuff broken by the switch to Qt Quick 2 than were
originally noticed, and the original fix was buggy as well.

Change-Id: I2b3e0619af923c52aba809355ac271b67097adf1
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

7 files changed, 31 insertions, 8 deletions

diff --git a/qbs/defaults.js b/qbs/defaults.js
index d64429e3c9..23a51f80e8 100644
--- a/qbs/defaults.js
+++ b/qbs/defaults.js
@@ -9,3 +9,16 @@ function qtLibraryName(qbs, name)
     }
     return name;
 }
+
+function versionIsAtLeast(actualVersion, expectedVersion)
+{
+    var actualVersionParts = actualVersion.split('.').map(function(item) { return parseInt(item, 10); });
+    var expectedVersionParts = expectedVersion.split('.').map(function(item) { return parseInt(item, 10); });
+    for (var i = 0; i < expectedVersionParts.length; ++i) {
+        if (actualVersionParts[i] > expectedVersionParts[i])
+            return true;
+        if (actualVersionParts[i] < expectedVersionParts[i])
+            return false;
+    }
+    return i === expectedVersionParts.length || expectedVersionParts[i] === 0;
+}
diff --git a/src/plugins/QtcPlugin.qbs b/src/plugins/QtcPlugin.qbs
index ea4a785934..e41cbe14a5 100644
--- a/src/plugins/QtcPlugin.qbs
+++ b/src/plugins/QtcPlugin.qbs
@@ -8,6 +8,10 @@ Product {
     property var pluginspecreplacements
     property var pluginRecommends: []
 
+    Depends { name: "Qt.core" }
+    property string minimumQtVersion: "4.8"
+    condition: Defaults.versionIsAtLeast(Qt.core.version, minimumQtVersion)
+
     targetName: Defaults.qtLibraryName(qbs, name)
     destinationDirectory: project.ide_plugin_path + '/' + provider
 
diff --git a/src/plugins/plugins.qbs b/src/plugins/plugins.qbs
index bad272f20d..7c7cf3bbd3 100644
--- a/src/plugins/plugins.qbs
+++ b/src/plugins/plugins.qbs
@@ -2,7 +2,6 @@ import qbs
 
 Project {
     name: "Plugins"
-    property bool buildWelcomePlugin: Qt.core.versionMajor >= 5
 
     references: [
         "analyzerbase/analyzerbase.qbs",
diff --git a/src/plugins/projectexplorer/projectexplorer.qbs b/src/plugins/projectexplorer/projectexplorer.qbs
index a1504711d0..6fdefb189d 100644
--- a/src/plugins/projectexplorer/projectexplorer.qbs
+++ b/src/plugins/projectexplorer/projectexplorer.qbs
@@ -1,11 +1,13 @@
 import qbs.base 1.0
 
+import "../../../qbs/defaults.js" as Defaults
 import "../QtcPlugin.qbs" as QtcPlugin
 
 QtcPlugin {
     name: "ProjectExplorer"
 
-    Depends { name: "Qt"; submodules: ["widgets", "xml", "network", "script", "quick"] }
+    Depends { name: "Qt"; submodules: ["core", "widgets", "xml", "network", "script"] }
+    Depends { name: "Qt.quick"; condition: Defaults.versionIsAtLeast(Qt.core.version, "5.1"); }
     Depends { name: "Core" }
     Depends { name: "Locator" }
     Depends { name: "Find" }
@@ -140,7 +142,7 @@ QtcPlugin {
 
     Group {
         name: "Project Welcome Page"
-        condition: project.buildWelcomePlugin
+        condition: Defaults.versionIsAtLeast(Qt.core.version, "5.1")
         files: [
             "projectwelcomepage.cpp",
             "projectwelcomepage.h"
diff --git a/src/plugins/qmlprofiler/qmlprofiler.qbs b/src/plugins/qmlprofiler/qmlprofiler.qbs
index 48df39e062..2670654cf6 100644
--- a/src/plugins/qmlprofiler/qmlprofiler.qbs
+++ b/src/plugins/qmlprofiler/qmlprofiler.qbs
@@ -4,8 +4,10 @@ import "../QtcPlugin.qbs" as QtcPlugin
 
 QtcPlugin {
     name: "QmlProfiler"
+    minimumQtVersion: "5.1"
 
-    Depends { name: "Qt"; submodules: ["widgets", "network", "qml", "quick"] }
+    Depends { name: "Qt"; submodules: ["widgets", "network"] }
+    Depends { name: "Qt.quick"; condition: product.condition; }
     Depends { name: "Core" }
     Depends { name: "AnalyzerBase" }
     Depends { name: "QmlProjectManager" }
diff --git a/src/plugins/qtsupport/qtsupport.qbs b/src/plugins/qtsupport/qtsupport.qbs
index a243b52e5a..8f88499c73 100644
--- a/src/plugins/qtsupport/qtsupport.qbs
+++ b/src/plugins/qtsupport/qtsupport.qbs
@@ -1,11 +1,13 @@
 import qbs.base 1.0
 
+import "../../../qbs/defaults.js" as Defaults
 import "../QtcPlugin.qbs" as QtcPlugin
 
 QtcPlugin {
     name: "QtSupport"
 
-    Depends { name: "Qt"; submodules: ["widgets", "quick"] }
+    Depends { name: "Qt"; submodules: ["core", "widgets"]; }
+    Depends { name: "Qt.quick"; condition: Defaults.versionIsAtLeast(Qt.core.version, "5.1"); }
     Depends { name: "Core" }
     Depends { name: "ProjectExplorer" }
     Depends { name: "TextEditor" }
@@ -112,7 +114,7 @@ QtcPlugin {
 
     Group {
         name: "Getting Started Welcome Page"
-        condition: project.buildWelcomePlugin
+        condition: Defaults.versionIsAtLeast(Qt.core.version, "5.1")
         files: [
             "gettingstartedwelcomepage.cpp",
             "gettingstartedwelcomepage.h"
diff --git a/src/plugins/welcome/welcome.qbs b/src/plugins/welcome/welcome.qbs
index 4d88c72f1e..8cde310ec9 100644
--- a/src/plugins/welcome/welcome.qbs
+++ b/src/plugins/welcome/welcome.qbs
@@ -4,9 +4,10 @@ import "../QtcPlugin.qbs" as QtcPlugin
 
 QtcPlugin {
     name: "Welcome"
-    condition: project.buildWelcomePlugin
+    minimumQtVersion: "5.1"
 
-    Depends { name: "Qt"; submodules: ["widgets", "network", "quick"] }
+    Depends { name: "Qt"; submodules: ["widgets", "network"] }
+    Depends { name: "Qt.quick"; condition: product.condition; }
     Depends { name: "Core" }
     Depends { name: "ProjectExplorer" }