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

Auto Test Project: Prefer Qt6 over Qt5

Browse Source 
Be consistent with the other wizards, and prefer Qt6 over Qt5,
if both are available.

Change-Id: I3a2f1c04c372a98ae6dacd884344fdd8d2ea2deb
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Kai Köhne
2021-07-14 08:00:44 +02:00
committed by Kai Koehne
parent 0ba7c5c0d5
commit e030d04892
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
share/qtcreator/templates/wizards/autotest/files/tst.txt
View File

@@ -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