feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Qbs files: Raise Qt requirement to 5.3.1

Browse Source 
Like we have now for the qmake build too.

Change-Id: I00a4cc01f35a4d93b52951c5591dadd4b6aa5e79
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
This commit is contained in:
Eike Ziller
2014-08-28 15:21:43 +02:00
parent 9d1bc2fdd3
commit b5ecaff32c
5 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
qbs/imports/QtcPlugin.qbs
View File

@@ -10,7 +10,7 @@ QtcProduct {
property var pluginspecreplacements property var pluginspecreplacements
property var pluginRecommends: [] property var pluginRecommends: []
property string minimumQtVersion: "4.8" property string minimumQtVersion: "5.3.1"
condition: QtcFunctions.versionIsAtLeast(Qt.core.version, minimumQtVersion) condition: QtcFunctions.versionIsAtLeast(Qt.core.version, minimumQtVersion)
targetName: QtcFunctions.qtLibraryName(qbs, name) targetName: QtcFunctions.qtLibraryName(qbs, name)

2
src/plugins/coreplugin/coreplugin.qbs
View File

@@ -14,7 +14,7 @@ QtcPlugin {
Depends { Depends {
name: "Qt.gui-private" name: "Qt.gui-private"
condition: qbs.targetOS.contains("windows") && Qt.core.versionMajor >= 5 condition: qbs.targetOS.contains("windows")
} }
Depends { name: "Utils" } Depends { name: "Utils" }

9
src/plugins/help/help.qbs
View File

@@ -6,17 +6,14 @@ QtcPlugin {
name: "Help" name: "Help"
Depends { name: "Qt"; submodules: ["help", "network"]; } Depends { name: "Qt"; submodules: ["help", "network"]; }
Depends { Depends { name: "Qt.printsupport" }
condition: Qt.core.versionMajor >= 5;
name: "Qt.printsupport"
}
Depends { Depends {
name: "Qt.webkit" name: "Qt.webkit"
required: false required: false
} }
Depends { Depends {
name: "Qt.webkitwidgets" name: "Qt.webkitwidgets"
condition: Qt.core.versionMajor >= 5 && Qt.webkit.present condition: Qt.webkit.present
} }
Depends { name: "Aggregation" } Depends { name: "Aggregation" }
@@ -29,7 +26,7 @@ QtcPlugin {
cpp.defines: { cpp.defines: {
var defines = base.concat(["QT_CLUCENE_SUPPORT"]); var defines = base.concat(["QT_CLUCENE_SUPPORT"]);
if (Qt.core.versionMajor >= 5 && !Qt.webkit.present) if (!Qt.webkit.present)
defines.push("QT_NO_WEBKIT"); defines.push("QT_NO_WEBKIT");
return defines; return defines;
} }

3
src/plugins/projectexplorer/projectexplorer.qbs
View File

@@ -7,7 +7,7 @@ QtcPlugin {
name: "ProjectExplorer" name: "ProjectExplorer"
Depends { name: "Qt"; submodules: ["widgets", "xml", "network", "script"] } 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: "Aggregation" }
Depends { name: "QtcSsh" } Depends { name: "QtcSsh" }
Depends { name: "Utils" } Depends { name: "Utils" }
@@ -160,7 +160,6 @@ QtcPlugin {
Group { Group {
name: "Project Welcome Page" name: "Project Welcome Page"
condition: QtcFunctions.versionIsAtLeast(Qt.core.version, "5.1")
files: [ files: [
"projectwelcomepage.cpp", "projectwelcomepage.cpp",
"projectwelcomepage.h" "projectwelcomepage.h"

3
src/plugins/qtsupport/qtsupport.qbs
View File

@@ -7,7 +7,7 @@ QtcPlugin {
name: "QtSupport" name: "QtSupport"
Depends { name: "Qt"; submodules: ["widgets"]; } 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: "Aggregation" }
Depends { name: "QmlJS" } Depends { name: "QmlJS" }
Depends { name: "Utils" } Depends { name: "Utils" }
@@ -126,7 +126,6 @@ QtcPlugin {
Group { Group {
name: "Getting Started Welcome Page" name: "Getting Started Welcome Page"
condition: QtcFunctions.versionIsAtLeast(Qt.core.version, "5.1")
files: [ files: [
"gettingstartedwelcomepage.cpp", "gettingstartedwelcomepage.cpp",
"gettingstartedwelcomepage.h" "gettingstartedwelcomepage.h"