From e030d0489269ae85659c14dc233fc10f50411ee8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20K=C3=B6hne?= Date: Wed, 14 Jul 2021 08:00:44 +0200 Subject: [PATCH] Auto Test Project: Prefer Qt6 over Qt5 Be consistent with the other wizards, and prefer Qt6 over Qt5, if both are available. Change-Id: I3a2f1c04c372a98ae6dacd884344fdd8d2ea2deb Reviewed-by: Eike Ziller Reviewed-by: Christian Stenger --- share/qtcreator/templates/wizards/autotest/files/tst.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/share/qtcreator/templates/wizards/autotest/files/tst.txt b/share/qtcreator/templates/wizards/autotest/files/tst.txt index 161fd0ff26f..fe8e30e789d 100644 --- a/share/qtcreator/templates/wizards/autotest/files/tst.txt +++ b/share/qtcreator/templates/wizards/autotest/files/tst.txt @@ -4,10 +4,10 @@ project(%{TestCaseName} LANGUAGES CXX) @if "%{TestFrameWork}" == "QtTest" @if "%{RequireGUI}" == "true" -find_package(QT NAMES Qt5 Qt6 COMPONENTS Gui Test REQUIRED) +find_package(QT NAMES Qt6 Qt5 COMPONENTS Gui Test REQUIRED) find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Gui Test REQUIRED) @else -find_package(QT NAMES Qt5 Qt6 COMPONENTS Test REQUIRED) +find_package(QT NAMES Qt6 Qt5 COMPONENTS Test REQUIRED) find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Test REQUIRED) @endif @@ -32,7 +32,7 @@ target_link_libraries(%{TestCaseName} PRIVATE Qt${QT_VERSION_MAJOR}::Test) @endif @if "%{TestFrameWork}" == "QtQuickTest" -find_package(QT NAMES Qt5 Qt6 COMPONENTS QuickTest REQUIRED) +find_package(QT NAMES Qt6 Qt5 COMPONENTS QuickTest REQUIRED) find_package(Qt${QT_VERSION_MAJOR} COMPONENTS QuickTest REQUIRED) set(CMAKE_INCLUDE_CURRENT_DIR ON) @@ -123,7 +123,7 @@ endif () SET(CMAKE_CXX_STANDARD 11) @if "%{Catch2NeedsQt}" == "true" -find_package(QT NAMES Qt5 Qt6 COMPONENTS Gui REQUIRED) +find_package(QT NAMES Qt6 Qt5 COMPONENTS Gui REQUIRED) find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Gui REQUIRED) @endif