From b5ecaff32cd9ef01142dd69c114b3f495af37abc Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@digia.com>
Date: Thu, 28 Aug 2014 15:21:43 +0200
Subject: [PATCH] Qbs files: Raise Qt requirement to 5.3.1

Like we have now for the qmake build too.

Change-Id: I00a4cc01f35a4d93b52951c5591dadd4b6aa5e79
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
---
 qbs/imports/QtcPlugin.qbs                       | 2 +-
 src/plugins/coreplugin/coreplugin.qbs           | 2 +-
 src/plugins/help/help.qbs                       | 9 +++------
 src/plugins/projectexplorer/projectexplorer.qbs | 3 +--
 src/plugins/qtsupport/qtsupport.qbs             | 3 +--
 5 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/qbs/imports/QtcPlugin.qbs b/qbs/imports/QtcPlugin.qbs
index ff06cdfa546..152d43e5b0f 100644
--- a/qbs/imports/QtcPlugin.qbs
+++ b/qbs/imports/QtcPlugin.qbs
@@ -10,7 +10,7 @@ QtcProduct {
     property var pluginspecreplacements
     property var pluginRecommends: []
 
-    property string minimumQtVersion: "4.8"
+    property string minimumQtVersion: "5.3.1"
     condition: QtcFunctions.versionIsAtLeast(Qt.core.version, minimumQtVersion)
 
     targetName: QtcFunctions.qtLibraryName(qbs, name)
diff --git a/src/plugins/coreplugin/coreplugin.qbs b/src/plugins/coreplugin/coreplugin.qbs
index 61b64c69546..e4937d98b08 100644
--- a/src/plugins/coreplugin/coreplugin.qbs
+++ b/src/plugins/coreplugin/coreplugin.qbs
@@ -14,7 +14,7 @@ QtcPlugin {
 
     Depends {
         name: "Qt.gui-private"
-        condition: qbs.targetOS.contains("windows") && Qt.core.versionMajor >= 5
+        condition: qbs.targetOS.contains("windows")
     }
 
     Depends { name: "Utils" }
diff --git a/src/plugins/help/help.qbs b/src/plugins/help/help.qbs
index 6fd14cdf072..c38c9a68915 100644
--- a/src/plugins/help/help.qbs
+++ b/src/plugins/help/help.qbs
@@ -6,17 +6,14 @@ QtcPlugin {
     name: "Help"
 
     Depends { name: "Qt"; submodules: ["help", "network"]; }
-    Depends {
-        condition: Qt.core.versionMajor >= 5;
-        name: "Qt.printsupport"
-    }
+    Depends { name: "Qt.printsupport" }
     Depends {
         name: "Qt.webkit"
         required: false
     }
     Depends {
         name: "Qt.webkitwidgets"
-        condition: Qt.core.versionMajor >= 5 && Qt.webkit.present
+        condition: Qt.webkit.present
     }
 
     Depends { name: "Aggregation" }
@@ -29,7 +26,7 @@ QtcPlugin {
 
     cpp.defines: {
         var defines = base.concat(["QT_CLUCENE_SUPPORT"]);
-        if (Qt.core.versionMajor >= 5 && !Qt.webkit.present)
+        if (!Qt.webkit.present)
             defines.push("QT_NO_WEBKIT");
         return defines;
     }
diff --git a/src/plugins/projectexplorer/projectexplorer.qbs b/src/plugins/projectexplorer/projectexplorer.qbs
index 4a4b434a7be..d0aaac3d219 100644
--- a/src/plugins/projectexplorer/projectexplorer.qbs
+++ b/src/plugins/projectexplorer/projectexplorer.qbs
@@ -7,7 +7,7 @@ QtcPlugin {
     name: "ProjectExplorer"
 
     Depends { name: "Qt"; submodules: ["widgets", "xml", "network", "script"] }
-    Depends { name: "Qt.quick"; condition: QtcFunctions.versionIsAtLeast(Qt.core.version, "5.1"); }
+    Depends { name: "Qt.quick" }
     Depends { name: "Aggregation" }
     Depends { name: "QtcSsh" }
     Depends { name: "Utils" }
@@ -160,7 +160,6 @@ QtcPlugin {
 
     Group {
         name: "Project Welcome Page"
-        condition: QtcFunctions.versionIsAtLeast(Qt.core.version, "5.1")
         files: [
             "projectwelcomepage.cpp",
             "projectwelcomepage.h"
diff --git a/src/plugins/qtsupport/qtsupport.qbs b/src/plugins/qtsupport/qtsupport.qbs
index 0a2229a61ab..984cddf1116 100644
--- a/src/plugins/qtsupport/qtsupport.qbs
+++ b/src/plugins/qtsupport/qtsupport.qbs
@@ -7,7 +7,7 @@ QtcPlugin {
     name: "QtSupport"
 
     Depends { name: "Qt"; submodules: ["widgets"]; }
-    Depends { name: "Qt.quick"; condition: QtcFunctions.versionIsAtLeast(Qt.core.version, "5.1"); }
+    Depends { name: "Qt.quick" }
     Depends { name: "Aggregation" }
     Depends { name: "QmlJS" }
     Depends { name: "Utils" }
@@ -126,7 +126,6 @@ QtcPlugin {
 
     Group {
         name: "Getting Started Welcome Page"
-        condition: QtcFunctions.versionIsAtLeast(Qt.core.version, "5.1")
         files: [
             "gettingstartedwelcomepage.cpp",
             "gettingstartedwelcomepage.h"