aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2020-07-23 17:52:59 +0200
committerChristian Kandeler <christian.kandeler@qt.io>2020-07-24 09:09:25 +0000
commitf3c276430ea0dba01f0dacded378531fc10d36d0 (patch)
tree19217f073926e9cabdeb9ccfab15625f5a764cd8
parent36caa1f292ddfd45b877d331e6d68f813563d259 (diff)
Bump required Qt version
... to 5.14. We need >= 5.12 for a recent QRegularExpression patch, and 5.14 is also what Qt Creator is currently on. Change-Id: I674e7b617acaed2bf2f668a31f82e800f05ccfc8 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
-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 db9a64af4..128c4d831 100644
--- a/doc/qbs.qdoc
+++ b/doc/qbs.qdoc
@@ -451,7 +451,7 @@
To build \QBS from the source, you need:
\list
- \li Qt 5.11, or later
+ \li Qt 5.14, 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 ed71f7e66..5f9d873e8 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.11.0"
+ property string minimumQtVersion: "5.14.0"
property bool install: true
property string targetInstallDir
cpp.defines: {
diff --git a/qbs.pro b/qbs.pro
index cf80b1fa1..2c04b91a4 100644
--- a/qbs.pro
+++ b/qbs.pro
@@ -24,9 +24,9 @@ defineTest(minQtVersion) {
return(false)
}
-!minQtVersion(5, 11, 0) {
+!minQtVersion(5, 14, 0) {
message("Cannot build qbs with Qt version $${QT_VERSION}.")
- error("Use at least Qt 5.11.0.")
+ error("Use at least Qt 5.14.0.")
}
TEMPLATE = subdirs