diff options
author | Eike Ziller <eike.ziller@qt.io> | 2022-07-04 10:58:01 +0200 |
---|---|---|
committer | Eike Ziller <eike.ziller@qt.io> | 2022-07-11 13:36:18 +0000 |
commit | b3384054778950cc4c1b8f0b21553112f4443948 (patch) | |
tree | aa76c62f0dc5dd1f16a8d86a1511267121d7cba5 | |
parent | 525a284f3e702596af3c2bd37d92340fa5ecb248 (diff) |
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>
-rw-r--r-- | README.md | 8 | ||||
-rw-r--r-- | cmake/QtCreatorAPI.cmake | 2 | ||||
-rw-r--r-- | coin/instructions/build.yaml | 4 | ||||
-rw-r--r-- | coin/instructions/common_environment.yaml | 51 | ||||
-rw-r--r-- | coin/instructions/provision.yaml | 4 | ||||
-rw-r--r-- | coin/instructions/test.yaml | 4 | ||||
-rw-r--r-- | qbs/imports/QtcProduct.qbs | 8 | ||||
-rw-r--r-- | qtcreator.qbs | 2 |
8 files changed, 26 insertions, 57 deletions
diff --git a/README.md b/README.md index 4ecf9f0aeb9..f7623259718 100644 --- a/README.md +++ b/README.md @@ -35,14 +35,16 @@ https://doc.qt.io/qtcreator-extending/coding-style.html Prerequisites: -* Qt 5.15.2 or later +* Qt 6.2 or later. The Qt version that you use to build Qt Creator defines the + minimum platform versions that the result supports + (Windows 10, RHEL/CentOS 8.4, Ubuntu 20.04, macOS 10.14 for Qt 6.2). * Qt WebEngine module for QtWebEngine based help viewer * On Windows: - * MinGW with GCC 7 or Visual Studio 2017 or later + * MinGW with GCC 9 or Visual Studio 2019 or later * Python 3.5 or later (optional, needed for the python enabled debug helper) * Debugging Tools for Windows (optional, for MSVC debugging support with CDB) * On Mac OS X: latest Xcode -* On Linux: GCC 7 or later +* On Linux: GCC 9 or later * LLVM/Clang 10 or later (optional, LLVM/Clang 14 is recommended. See [instructions](#getting-llvmclang-for-the-clang-code-model) on how to get LLVM. diff --git a/cmake/QtCreatorAPI.cmake b/cmake/QtCreatorAPI.cmake index 348072429d2..f772e3d9e56 100644 --- a/cmake/QtCreatorAPI.cmake +++ b/cmake/QtCreatorAPI.cmake @@ -3,7 +3,7 @@ if(QT_CREATOR_API_DEFINED) endif() set(QT_CREATOR_API_DEFINED TRUE) -set(IDE_QT_VERSION_MIN "5.15.2") +set(IDE_QT_VERSION_MIN "6.2.0") include(${CMAKE_CURRENT_LIST_DIR}/QtCreatorAPIInternal.cmake) include(${CMAKE_CURRENT_LIST_DIR}/QtcSeparateDebugInfo.cmake) diff --git a/coin/instructions/build.yaml b/coin/instructions/build.yaml index 3110b3b3fea..f9219f1dd37 100644 --- a/coin/instructions/build.yaml +++ b/coin/instructions/build.yaml @@ -153,3 +153,7 @@ instructions: maxTimeInSeconds: 1800 maxTimeBetweenOutput: 1800 +enable_if: + condition: property + property: features + not_contains_value: "Qt5" diff --git a/coin/instructions/common_environment.yaml b/coin/instructions/common_environment.yaml index 6141d447915..2df7ad16e38 100644 --- a/coin/instructions/common_environment.yaml +++ b/coin/instructions/common_environment.yaml @@ -47,52 +47,6 @@ instructions: condition: property property: target.os equals_value: MacOS - enable_if: - condition: property - property: features - not_contains_value: "Qt5" - - type: Group - instructions: - - type: EnvironmentVariable - variableName: QTC_QT_BASE_URL - variableValue: "http://ci-files02-hki.intra.qt.io/packages/jenkins/archive/qt/5.15/5.15.2-final-released/latest" - - type: EnvironmentVariable - variableName: QTC_QT_MODULES - variableValue: "qtbase qtdeclarative qtimageformats qtquick3d qtquickcontrols2 qtquicktimeline qtserialport qtsvg qttools qttranslations" - - type: EnvironmentVariable - variableName: MACOSX_DEPLOYMENT_TARGET - variableValue: 10.13 - - type: Group - instructions: - - type: EnvironmentVariable - variableName: QTC_QT_POSTFIX - variableValue: "-Windows-Windows_10-MSVC2019-Windows-Windows_10-X86_64.7z" - enable_if: - condition: property - property: target.os - equals_value: Windows - - type: Group - instructions: - - type: EnvironmentVariable - variableName: QTC_QT_POSTFIX - variableValue: "-Linux-RHEL_7_6-GCC-Linux-RHEL_7_6-X86_64.7z" - enable_if: - condition: property - property: target.os - equals_value: Linux - - type: Group - instructions: - - type: EnvironmentVariable - variableName: QTC_QT_POSTFIX - variableValue: "-MacOS-MacOS_10_13-Clang-MacOS-MacOS_10_13-X86_64.7z" - enable_if: - condition: property - property: target.os - equals_value: MacOS - enable_if: - condition: property - property: features - contains_value: "Qt5" - type: PrependToEnvironmentVariable variableName: PATH @@ -133,3 +87,8 @@ instructions: condition: property property: host.os equals_value: Linux + +enable_if: + condition: property + property: features + not_contains_value: "Qt5" diff --git a/coin/instructions/provision.yaml b/coin/instructions/provision.yaml index 302103ec3f6..37661084e64 100644 --- a/coin/instructions/provision.yaml +++ b/coin/instructions/provision.yaml @@ -85,3 +85,7 @@ instructions: property: target.arch equals_value: X86_64 +enable_if: + condition: property + property: features + not_contains_value: "Qt5" diff --git a/coin/instructions/test.yaml b/coin/instructions/test.yaml index 7786d75f5ed..1cbd4fd16d1 100644 --- a/coin/instructions/test.yaml +++ b/coin/instructions/test.yaml @@ -7,3 +7,7 @@ instructions: maxTimeInSeconds: 600 maxTimeBetweenOutput: 600 userMessageOnFailure: "Failed to run tests, check logs" +enable_if: + condition: property + property: features + not_contains_value: "Qt5" diff --git a/qbs/imports/QtcProduct.qbs b/qbs/imports/QtcProduct.qbs index ee84b46aa3e..9c2eb6be880 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, diff --git a/qtcreator.qbs b/qtcreator.qbs index f586a12237b..7f70064e84a 100644 --- a/qtcreator.qbs +++ b/qtcreator.qbs @@ -5,7 +5,7 @@ import qbs.FileInfo Project { name: "Qt Creator" minimumQbsVersion: "1.19.0" - property string minimumMacosVersion: "10.12" + property string minimumMacosVersion: "10.14" property bool withAutotests: qbs.buildVariant === "debug" property path ide_source_tree: path property pathList additionalPlugins: [] |