feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Force minimum of Qt 6.5 for "Qt 6" version of CMake wizards

Browse Source 
The console and widgets app got a new template for simplified CMake files
with Qt 6. These require Qt 6.5 or later, so state that both in the
label and the CMake files.

Change-Id: I23e39b82017f8f11ab720fa701786912e46ea26d
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
This commit is contained in:
Eike Ziller
2024-10-07 14:46:34 +02:00
parent 0242ab8991
commit 623854d452
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
share/qtcreator/templates/wizards/projects/consoleapp/CMakeLists-Qt6.txt
View File

@@ -2,9 +2,9 @@ cmake_minimum_required(VERSION 3.19)
project(%{ProjectName} LANGUAGES CXX) project(%{ProjectName} LANGUAGES CXX)
@if %{HasTranslation} @if %{HasTranslation}
find_package(Qt6 REQUIRED COMPONENTS Core LinguistTools) find_package(Qt6 6.5 REQUIRED COMPONENTS Core LinguistTools)
@else @else
find_package(Qt6 REQUIRED COMPONENTS Core) find_package(Qt6 6.5 REQUIRED COMPONENTS Core)
@endif @endif
qt_standard_project_setup() qt_standard_project_setup()

2
share/qtcreator/templates/wizards/projects/consoleapp/wizard.json
View File

@@ -58,7 +58,7 @@
"condition": "%{JS: value('Plugins').indexOf('CMakeProjectManager') >= 0}" "condition": "%{JS: value('Plugins').indexOf('CMakeProjectManager') >= 0}"
}, },
{ {
"trKey": "CMake for Qt 6", "trKey": "CMake for Qt 6.5 and Later",
"value": "cmake-qt6", "value": "cmake-qt6",
"condition": "%{JS: value('Plugins').indexOf('CMakeProjectManager') >= 0}" "condition": "%{JS: value('Plugins').indexOf('CMakeProjectManager') >= 0}"
}, },

4
share/qtcreator/templates/wizards/projects/qtwidgetsapplication/CMakeLists-Qt6.txt
View File

@@ -2,9 +2,9 @@ cmake_minimum_required(VERSION 3.19)
project(%{ProjectName} LANGUAGES CXX) project(%{ProjectName} LANGUAGES CXX)
@if %{HasTranslation} @if %{HasTranslation}
find_package(Qt6 REQUIRED COMPONENTS Core Widgets LinguistTools) find_package(Qt6 6.5 REQUIRED COMPONENTS Core Widgets LinguistTools)
@else @else
find_package(Qt6 REQUIRED COMPONENTS Core Widgets) find_package(Qt6 6.5 REQUIRED COMPONENTS Core Widgets)
@endif @endif
qt_standard_project_setup() qt_standard_project_setup()

2
share/qtcreator/templates/wizards/projects/qtwidgetsapplication/wizard.json
View File

@@ -64,7 +64,7 @@
"condition": "%{JS: value('Plugins').indexOf('CMakeProjectManager') >= 0}" "condition": "%{JS: value('Plugins').indexOf('CMakeProjectManager') >= 0}"
}, },
{ {
"trKey": "CMake for Qt 6", "trKey": "CMake for Qt 6.5 and Later",
"value": "cmake-qt6", "value": "cmake-qt6",
"condition": "%{JS: value('Plugins').indexOf('CMakeProjectManager') >= 0}" "condition": "%{JS: value('Plugins').indexOf('CMakeProjectManager') >= 0}"
}, },