QuasarApp/QMLLoginView
4
0
Fork 0
mirror of https://github.com/QuasarApp/QMLLoginView.git synced 2025-04-26 17:54:39 +00:00
Code Issues Projects Releases Wiki Activity

added Qt6 support

Browse Source
This commit is contained in:
Andrei Yankovich 2020-12-27 15:40:03 +03:00
parent a3c1dce2df
commit 5f1de16eff
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
LoginView/CMakeLists.txt
View File

@ -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 $<$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>: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")

6
example/CMakeLists.txt
View File

@ -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 $<$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>: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)