aboutsummaryrefslogtreecommitdiffstats
path: root/qbs
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2020-10-26 14:17:28 +0100
committerChristian Kandeler <christian.kandeler@qt.io>2020-10-26 15:25:10 +0000
commit7e5ec83c1bfff8f0fabcea88f091086e0996524b (patch)
tree722d35a763e0723a666cfefd9b53409cde1ca6f7 /qbs
parenta8a6a9e77480048f47b5848aea33582f83e02b84 (diff)
Get qbs build closer to building with Qt 6
Change-Id: Idf96a03db3b3f1aa5af07fb59f261250d7787e61 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'qbs')
-rw-r--r--qbs/imports/QtcProduct.qbs4
1 files changed, 4 insertions, 0 deletions
diff --git a/qbs/imports/QtcProduct.qbs b/qbs/imports/QtcProduct.qbs
index 0509b79d78..829394d798 100644
--- a/qbs/imports/QtcProduct.qbs
+++ b/qbs/imports/QtcProduct.qbs
@@ -29,6 +29,10 @@ Product {
}
}
Depends { name: "Qt.core"; versionAtLeast: "5.14.0" }
+ Depends {
+ name: "Qt.core5compat"
+ condition: Utilities.versionCompare(Qt.core.version, "6") >= 0
+ }
// TODO: Should fall back to what came from Qt.core for Qt < 5.7, but we cannot express that
// atm. Conditionally pulling in a module that sets the property is also not possible,