diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2020-07-03 15:45:41 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-07-05 18:00:46 +0200 |
| commit | 36b253eebdf5169709475a8e9b4726f3d19a771b (patch) | |
| tree | 3b3ee2f62e5b1b34e3f64ed56e3c9508db9b76c5 /tests/auto/cmake | |
| parent | a056cb9595ea4a41c93f4c912719f9523b943d3b (diff) | |
Prepare Qt5QuickCompiler.cmake.in for Qt6
Increment all the version numbers. Replace
qtquick_compiler_add_resources with a warning and a call to
qt6_add_resources.
Task-number: QTBUG-85190
Change-Id: Ifed5449ab4d6312a57add870eee13175872146db
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'tests/auto/cmake')
| -rw-r--r-- | tests/auto/cmake/qtquickcompiler/CMakeLists.txt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/auto/cmake/qtquickcompiler/CMakeLists.txt b/tests/auto/cmake/qtquickcompiler/CMakeLists.txt index 9f8112ef49..1eb4c4286c 100644 --- a/tests/auto/cmake/qtquickcompiler/CMakeLists.txt +++ b/tests/auto/cmake/qtquickcompiler/CMakeLists.txt @@ -2,16 +2,16 @@ cmake_minimum_required(VERSION 2.8) project(qqc_test) -find_package(Qt5Qml 5.0.0 REQUIRED) -find_package(Qt5Gui 5.0.0 REQUIRED) -find_package(Qt5Test 5.0.0 REQUIRED) -find_package(Qt5QuickCompiler) +find_package(Qt6Qml 6.0.0 REQUIRED) +find_package(Qt6Gui 6.0.0 REQUIRED) +find_package(Qt6Test 6.0.0 REQUIRED) +find_package(Qt6QuickCompiler) -set(CMAKE_CXXFLAGS "${CMAKE_CXXFLAGS} ${Qt5Core_EXECUTABLE_COMPILE_FLAGS}") +set(CMAKE_CXXFLAGS "${CMAKE_CXXFLAGS} ${Qt6Core_EXECUTABLE_COMPILE_FLAGS}") qtquick_compiler_add_resources(RESOURCES "empty.qrc" "resources with space/qqc_test.qrc") set(CMAKE_AUTOMOC ON) add_executable(qqc_test "${CMAKE_CURRENT_SOURCE_DIR}/main.cpp" ${RESOURCES}) -target_link_libraries(qqc_test Qt5::Gui Qt5::Qml Qt5::Test) +target_link_libraries(qqc_test Qt6::Gui Qt6::Qml Qt6::Test) |