diff options
author | Christian Kandeler <christian.kandeler@qt.io> | 2021-04-30 16:06:41 +0200 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@qt.io> | 2021-05-10 13:36:34 +0000 |
commit | 7cc2b149b1105195701451ca39871c37083b4bd5 (patch) | |
tree | 1ae08fae86728efdff179d4906dc1a413bf9a520 /qbs | |
parent | 9e9bd383bcb3e9b0569671ed06a49cd2103ac6ae (diff) | |
download | qt-creator-7cc2b149b1105195701451ca39871c37083b4bd5.tar.gz |
qbs build: Make ImageViewer build with Qt 6
Change-Id: If934d2df162e043102ba65d9c3de4fb7fc121540
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'qbs')
-rw-r--r-- | qbs/imports/QtcProduct.qbs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/qbs/imports/QtcProduct.qbs b/qbs/imports/QtcProduct.qbs index 959ce51bb6..104181657b 100644 --- a/qbs/imports/QtcProduct.qbs +++ b/qbs/imports/QtcProduct.qbs @@ -17,6 +17,7 @@ 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" } @@ -31,7 +32,7 @@ Product { Depends { name: "Qt.core"; versionAtLeast: "5.14.0" } Depends { name: "Qt.core5compat" - condition: Utilities.versionCompare(Qt.core.version, "6") >= 0 + condition: usesQt6 } // TODO: Should fall back to what came from Qt.core for Qt < 5.7, but we cannot express that |