From 5f1de16eff04a5daf3fefb44aa6d17f49c89e8f3 Mon Sep 17 00:00:00 2001 From: EndrII Date: Sun, 27 Dec 2020 15:40:03 +0300 Subject: [PATCH] added Qt6 support --- LoginView/CMakeLists.txt | 5 +++-- example/CMakeLists.txt | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/LoginView/CMakeLists.txt b/LoginView/CMakeLists.txt index bcf4a35..76b244f 100644 --- a/LoginView/CMakeLists.txt +++ b/LoginView/CMakeLists.txt @@ -19,7 +19,8 @@ add_definitions(-DLOGIN_VIEW_LIBRARY) include(${CMAKE_CURRENT_SOURCE_DIR}/../CMake/ProjectOut.cmake) -find_package(Qt5 COMPONENTS Core Quick Xml REQUIRED) +find_package(QT NAMES Qt6 Qt5 COMPONENTS Core Quick Xml REQUIRED) +find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Quick Xml REQUIRED) file(GLOB SOURCE_CPP "src/*.cpp" "src/*.qrc") @@ -28,7 +29,7 @@ add_library(${PROJECT_NAME} SHARED ${SOURCE_CPP}) target_compile_definitions(LoginView PRIVATE $<$,$>:QT_QML_DEBUG>) -target_link_libraries(${PROJECT_NAME} PUBLIC Qt5::Core Qt5::Quick Qt5::Xml) +target_link_libraries(${PROJECT_NAME} PUBLIC Qt::Core Qt::Quick Qt::Xml) target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/src) set(QML_IMPORT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/src" CACHE STRING "Qt Creator extra qml import paths") diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt index 745161c..e77b3bb 100644 --- a/example/CMakeLists.txt +++ b/example/CMakeLists.txt @@ -20,8 +20,8 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) include(${CMAKE_CURRENT_SOURCE_DIR}/../CMake/ProjectOut.cmake) -find_package(Qt5 COMPONENTS Core QuickControls2 REQUIRED) - +find_package(QT NAMES Qt6 Qt5 COMPONENTS Core QuickControls2 REQUIRED) +find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core QuickControls2 REQUIRED) if(ANDROID) add_library(${PROJECT_NAME} SHARED @@ -38,5 +38,5 @@ endif() target_compile_definitions(${PROJECT_NAME} PRIVATE $<$,$>:QT_QML_DEBUG>) -target_link_libraries(${PROJECT_NAME} PRIVATE Qt5::Core Qt5::QuickControls2 LoginView) +target_link_libraries(${PROJECT_NAME} PRIVATE Qt::Core Qt::QuickControls2 LoginView)