summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2017-09-26 15:35:58 +0200
committerChristian Kandeler <christian.kandeler@qt.io>2017-09-26 14:02:44 +0000
commitf45369b8f5c7c09305e4e31a2ae78b7986bda0d8 (patch)
treea9b9aacf699d7d9badd831bdf96059ad16003ed4
parent653e1e18c16a8a31a3806cc5e171c657170f2018 (diff)
downloadqt-creator-f45369b8f5c7c09305e4e31a2ae78b7986bda0d8.tar.gz
Fix qbs build for qbs >= 1.10
Shadowing modules does no longer work from qbs 1.10 on; we need to give our implementation of qbsbuildconfig a higher priority. Change-Id: I703b780d564c43ebc2a4318f683537f10c4e5f3c Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
-rw-r--r--qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs2
1 files changed, 2 insertions, 0 deletions
diff --git a/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs b/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs
index a16eae5d41..492a6fe457 100644
--- a/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs
+++ b/qbs/modules/qbsbuildconfig/qbsbuildconfig.qbs
@@ -4,6 +4,8 @@ import qbs.FileInfo
Module {
Depends { name: "qtc" }
+ property bool priority: 1 // TODO: Remove declaration after 1.11 is out.
+
property bool enableUnitTests: false
property bool enableProjectFileUpdates: true
property bool installApiHeaders: false