diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2023-04-13 15:59:08 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2023-04-13 15:59:08 +0200 |
| commit | 2bc37de42b5dd1f0d0a8cea29e5a2cc4926836b5 (patch) | |
| tree | e613605a0c295a2af7010e92d7b5d412654bf137 /qbs | |
| parent | b1415a0ea58e0860c790b1b5ff5fbd3d4bfdd87a (diff) | |
| parent | 02f2a93503a24d2da3b93db2cbfe8463627cf990 (diff) | |
| download | qt-creator-2bc37de42b5dd1f0d0a8cea29e5a2cc4926836b5.tar.gz | |
Merge remote-tracking branch 'origin/10.0'
Conflicts:
src/plugins/python/pipsupport.cpp
src/plugins/qtsupport/exampleslistmodel.cpp
src/plugins/qtsupport/examplesparser.cpp
tests/auto/examples/tst_examples.cpp
Change-Id: I00273622423fa99d41621969f6ecbbdaa0e18664
Diffstat (limited to 'qbs')
| -rw-r--r-- | qbs/modules/qtc/qtc.qbs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qbs/modules/qtc/qtc.qbs b/qbs/modules/qtc/qtc.qbs index 1e028f62fc..226d432b18 100644 --- a/qbs/modules/qtc/qtc.qbs +++ b/qbs/modules/qtc/qtc.qbs @@ -100,7 +100,7 @@ Module { Properties { condition: cpp.present && qbs.toolchain.contains("msvc") && product.Qt - && Utilities.versionCompare(Qt.core.version, "6.3") >= 0 + && Utilities.versionCompare(product.Qt.core.version, "6.3") >= 0 && Utilities.versionCompare(cpp.compilerVersion, "19.10") >= 0 && Utilities.versionCompare(qbs.version, "1.23") < 0 cpp.cxxFlags: "/permissive-" |