aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2019-04-26 09:38:22 +0200
committerChristian Kandeler <christian.kandeler@qt.io>2019-04-26 07:54:54 +0000
commit18555b8e3f1fb3a87aea9ea3008127152e399d91 (patch)
tree0f71ebaede6005654b0d44ee0498c968cf36fa77
parentfe9e48d1d939a2bf98a110be5efccc55ebdcbd4f (diff)
Increase minimum required Qt version
We recently merged a patch that used Qt 5.10 functionality. Let's use this opportunity to increase the minimum required Qt version. We choose 5.11, since that is also Qt Creator's requirement. Change-Id: I729a7e840ab9cdafb8f9fba604e413cd4b822bed Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
-rw-r--r--doc/qbs.qdoc2
-rw-r--r--qbs-resources/imports/QbsProduct.qbs2
-rw-r--r--qbs.pro4
3 files changed, 4 insertions, 4 deletions
diff --git a/doc/qbs.qdoc b/doc/qbs.qdoc
index 1eb1d2bec..42146ec6c 100644
--- a/doc/qbs.qdoc
+++ b/doc/qbs.qdoc
@@ -450,7 +450,7 @@
To build \QBS from the source, you need:
\list
- \li Qt 5.9, or later
+ \li Qt 5.11, or later
\li Windows: MinGW with GCC 4.9 or Microsoft Visual Studio 2015,
or later
\li Linux: GCC 4.9, or later, or Clang 3.9.0, or later
diff --git a/qbs-resources/imports/QbsProduct.qbs b/qbs-resources/imports/QbsProduct.qbs
index 1685a9d4e..b3a166e42 100644
--- a/qbs-resources/imports/QbsProduct.qbs
+++ b/qbs-resources/imports/QbsProduct.qbs
@@ -4,7 +4,7 @@ Product {
Depends { name: "qbsbuildconfig" }
Depends { name: "qbsversion" }
Depends { name: "Qt.core"; versionAtLeast: minimumQtVersion }
- property string minimumQtVersion: "5.9.0"
+ property string minimumQtVersion: "5.11.0"
property bool install: true
property string targetInstallDir
cpp.defines: {
diff --git a/qbs.pro b/qbs.pro
index 4be68099b..3a716c7d3 100644
--- a/qbs.pro
+++ b/qbs.pro
@@ -24,9 +24,9 @@ defineTest(minQtVersion) {
return(false)
}
-!minQtVersion(5, 9, 0) {
+!minQtVersion(5, 11, 0) {
message("Cannot build qbs with Qt version $${QT_VERSION}.")
- error("Use at least Qt 5.9.0.")
+ error("Use at least Qt 5.11.0.")
}
TEMPLATE = subdirs