summaryrefslogtreecommitdiff
path: root/qbs
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2022-07-04 10:58:01 +0200
committerEike Ziller <eike.ziller@qt.io>2022-07-11 13:36:18 +0000
commitb3384054778950cc4c1b8f0b21553112f4443948 (patch)
treeaa76c62f0dc5dd1f16a8d86a1511267121d7cba5 /qbs
parent525a284f3e702596af3c2bd37d92340fa5ecb248 (diff)
downloadqt-creator-b3384054778950cc4c1b8f0b21553112f4443948.tar.gz
Require Qt 6.2 for building Qt Creator
Change-Id: I43f7bf123e359b4e312269f645a9d26aeeeb6d7a Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'qbs')
-rw-r--r--qbs/imports/QtcProduct.qbs8
1 files changed, 2 insertions, 6 deletions
diff --git a/qbs/imports/QtcProduct.qbs b/qbs/imports/QtcProduct.qbs
index ee84b46aa3..9c2eb6be88 100644
--- a/qbs/imports/QtcProduct.qbs
+++ b/qbs/imports/QtcProduct.qbs
@@ -17,7 +17,6 @@ Product {
FileInfo.relativePath(FileInfo.joinPaths('/', qtc.ide_qbs_imports_path),
FileInfo.joinPaths('/', qtc.ide_shared_sources_path)))
property bool sanitizable: true
- property bool usesQt6: Utilities.versionCompare(Qt.core.version, "6") >= 0
Depends { name: "cpp" }
Depends { name: "qtc" }
@@ -29,11 +28,8 @@ Product {
enableFallback: false
}
}
- Depends { name: "Qt.core"; versionAtLeast: "5.15.2" }
- Depends {
- name: "Qt.core5compat"
- condition: usesQt6
- }
+ Depends { name: "Qt.core"; versionAtLeast: "6.2.0" }
+ Depends { name: "Qt.core5compat" }
// 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,