From 623854d4527f1dee850fe1a646c10cc2a29bfdd2 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Mon, 7 Oct 2024 14:46:34 +0200 Subject: [PATCH] Force minimum of Qt 6.5 for "Qt 6" version of CMake wizards 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 Reviewed-by: Marcus Tillmanns --- .../templates/wizards/projects/consoleapp/CMakeLists-Qt6.txt | 4 ++-- .../templates/wizards/projects/consoleapp/wizard.json | 2 +- .../wizards/projects/qtwidgetsapplication/CMakeLists-Qt6.txt | 4 ++-- .../wizards/projects/qtwidgetsapplication/wizard.json | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/share/qtcreator/templates/wizards/projects/consoleapp/CMakeLists-Qt6.txt b/share/qtcreator/templates/wizards/projects/consoleapp/CMakeLists-Qt6.txt index 31e0827243f..162310fb356 100644 --- a/share/qtcreator/templates/wizards/projects/consoleapp/CMakeLists-Qt6.txt +++ b/share/qtcreator/templates/wizards/projects/consoleapp/CMakeLists-Qt6.txt @@ -2,9 +2,9 @@ cmake_minimum_required(VERSION 3.19) project(%{ProjectName} LANGUAGES CXX) @if %{HasTranslation} -find_package(Qt6 REQUIRED COMPONENTS Core LinguistTools) +find_package(Qt6 6.5 REQUIRED COMPONENTS Core LinguistTools) @else -find_package(Qt6 REQUIRED COMPONENTS Core) +find_package(Qt6 6.5 REQUIRED COMPONENTS Core) @endif qt_standard_project_setup() diff --git a/share/qtcreator/templates/wizards/projects/consoleapp/wizard.json b/share/qtcreator/templates/wizards/projects/consoleapp/wizard.json index 9e59d4d8c33..759ec220f85 100644 --- a/share/qtcreator/templates/wizards/projects/consoleapp/wizard.json +++ b/share/qtcreator/templates/wizards/projects/consoleapp/wizard.json @@ -58,7 +58,7 @@ "condition": "%{JS: value('Plugins').indexOf('CMakeProjectManager') >= 0}" }, { - "trKey": "CMake for Qt 6", + "trKey": "CMake for Qt 6.5 and Later", "value": "cmake-qt6", "condition": "%{JS: value('Plugins').indexOf('CMakeProjectManager') >= 0}" }, diff --git a/share/qtcreator/templates/wizards/projects/qtwidgetsapplication/CMakeLists-Qt6.txt b/share/qtcreator/templates/wizards/projects/qtwidgetsapplication/CMakeLists-Qt6.txt index fab47ee1a65..f2395d7a0b5 100644 --- a/share/qtcreator/templates/wizards/projects/qtwidgetsapplication/CMakeLists-Qt6.txt +++ b/share/qtcreator/templates/wizards/projects/qtwidgetsapplication/CMakeLists-Qt6.txt @@ -2,9 +2,9 @@ cmake_minimum_required(VERSION 3.19) project(%{ProjectName} LANGUAGES CXX) @if %{HasTranslation} -find_package(Qt6 REQUIRED COMPONENTS Core Widgets LinguistTools) +find_package(Qt6 6.5 REQUIRED COMPONENTS Core Widgets LinguistTools) @else -find_package(Qt6 REQUIRED COMPONENTS Core Widgets) +find_package(Qt6 6.5 REQUIRED COMPONENTS Core Widgets) @endif qt_standard_project_setup() diff --git a/share/qtcreator/templates/wizards/projects/qtwidgetsapplication/wizard.json b/share/qtcreator/templates/wizards/projects/qtwidgetsapplication/wizard.json index 9e3fd48bca3..de20629065d 100644 --- a/share/qtcreator/templates/wizards/projects/qtwidgetsapplication/wizard.json +++ b/share/qtcreator/templates/wizards/projects/qtwidgetsapplication/wizard.json @@ -64,7 +64,7 @@ "condition": "%{JS: value('Plugins').indexOf('CMakeProjectManager') >= 0}" }, { - "trKey": "CMake for Qt 6", + "trKey": "CMake for Qt 6.5 and Later", "value": "cmake-qt6", "condition": "%{JS: value('Plugins').indexOf('CMakeProjectManager') >= 0}" },