diff options
| author | Tim Jenssen <tim.jenssen@qt.io> | 2023-06-22 16:49:37 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@qt.io> | 2023-06-22 14:50:56 +0000 |
| commit | 846f8dba92cb5e94861573fa82b5c9430fabdb1b (patch) | |
| tree | b9f25735cabcac99c6285c6cc7a3f8e9d3328bc6 /qbs | |
| parent | dfe77895068ef74ed495c7053576dcdf6b8ad7a1 (diff) | |
| parent | c3fd118c6222d568b9455c1a7bca1271be79502f (diff) | |
Merge remote-tracking branch 'origin/11.0' into qds/dev
Conflicts: src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.cpp
src/plugins/qmldesigner/components/stateseditornew/stateseditorwidget.cpp
tests/unit/unittest/qmlprojectmanager/projectitem-test.cpp
Change-Id: Icdb63851ec0162d82217e85b3beb0b6f9f12899e
Diffstat (limited to 'qbs')
| -rw-r--r-- | qbs/imports/QtcProduct.qbs | 11 | ||||
| -rw-r--r-- | qbs/modules/qtc/qtc.qbs | 6 |
2 files changed, 11 insertions, 6 deletions
diff --git a/qbs/imports/QtcProduct.qbs b/qbs/imports/QtcProduct.qbs index 9c2eb6be88..e5f341704d 100644 --- a/qbs/imports/QtcProduct.qbs +++ b/qbs/imports/QtcProduct.qbs @@ -13,6 +13,7 @@ Product { property string fileName: FileInfo.fileName(sourceDirectory) + ".qbs" property bool useNonGuiPchFile: false property bool useGuiPchFile: false + property bool useQt: true property string pathToSharedSources: FileInfo.joinPaths(path, FileInfo.relativePath(FileInfo.joinPaths('/', qtc.ide_qbs_imports_path), FileInfo.joinPaths('/', qtc.ide_shared_sources_path))) @@ -28,8 +29,12 @@ Product { enableFallback: false } } - Depends { name: "Qt.core"; versionAtLeast: "6.2.0" } - Depends { name: "Qt.core5compat" } + Depends { + name: "Qt" + condition: useQt + submodules: ["core", "core5compat"] + versionAtLeast: "6.2.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, @@ -75,7 +80,7 @@ Product { cpp.cxxLanguageVersion: "c++17" cpp.defines: qtc.generalDefines cpp.minimumWindowsVersion: "6.1" - cpp.useCxxPrecompiledHeader: useNonGuiPchFile || useGuiPchFile + cpp.useCxxPrecompiledHeader: useQt && (useNonGuiPchFile || useGuiPchFile) cpp.visibility: "minimal" Group { diff --git a/qbs/modules/qtc/qtc.qbs b/qbs/modules/qtc/qtc.qbs index 226d432b18..01dd13cc9d 100644 --- a/qbs/modules/qtc/qtc.qbs +++ b/qbs/modules/qtc/qtc.qbs @@ -6,16 +6,16 @@ import qbs.Utilities Module { Depends { name: "cpp"; required: false } - property string qtcreator_display_version: '11.0.0-beta1' + property string qtcreator_display_version: '11.0.0-rc1' property string ide_version_major: '10' property string ide_version_minor: '0' - property string ide_version_release: '82' + property string ide_version_release: '84' property string qtcreator_version: ide_version_major + '.' + ide_version_minor + '.' + ide_version_release property string ide_compat_version_major: '10' property string ide_compat_version_minor: '0' - property string ide_compat_version_release: '82' + property string ide_compat_version_release: '84' property string qtcreator_compat_version: ide_compat_version_major + '.' + ide_compat_version_minor + '.' + ide_compat_version_release |