qt6 ready

6 files changed, 15 insertions, 15 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a22c910..dd3b026 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,9 +2,9 @@ cmake_minimum_required(VERSION 3.16)
 
 project(diceparser VERSION 1.9.0 DESCRIPTION "Parser of dice command")
 
-set(QT_REQUIRED_VERSION "5.12.0")
-find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED COMPONENTS Core Test Gui Svg)
-find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG COMPONENTS Qml Concurrent)
+set(QT_REQUIRED_VERSION "6.3.0")
+find_package(Qt6 ${QT_REQUIRED_VERSION} CONFIG REQUIRED COMPONENTS Core Test Gui Svg)
+find_package(Qt6 ${QT_REQUIRED_VERSION} CONFIG COMPONENTS Qml Concurrent)
 
 enable_testing(true)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR} result node)
@@ -67,7 +67,7 @@ SET( dice_sources
 IF(STATIC_BUILD)
     add_library(diceparser_static STATIC ${dice_sources} )
     target_include_directories(diceparser_static PRIVATE include)
-    target_link_libraries(diceparser_static PUBLIC Qt5::Core Qt5::Gui Qt5::Svg)
+    target_link_libraries(diceparser_static PUBLIC Qt6::Core Qt6::Gui Qt6::Svg)
     install(TARGETS diceparser_static
         ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
 endif()
@@ -80,7 +80,7 @@ target_include_directories(diceparser_shared PRIVATE include ./)
 
 
 SET_TARGET_PROPERTIES(diceparser_shared PROPERTIES OUTPUT_NAME diceparser CLEAN_DIRECT_OUTPUT 1)
-target_link_libraries(diceparser_shared PUBLIC Qt5::Core Qt5::Gui Qt5::Svg)
+target_link_libraries(diceparser_shared PUBLIC Qt6::Core Qt6::Gui Qt6::Svg)
 
 set_target_properties(diceparser_shared PROPERTIES VERSION ${PROJECT_VERSION})
 set_target_properties(diceparser_shared PROPERTIES SOVERSION 1)
@@ -108,7 +108,7 @@ configure_file(diceparser.pc.in diceparser.pc @ONLY)
 
 install(FILES ${CMAKE_BINARY_DIR}/diceparser.pc DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pkgconfig)
 
-if(Qt5Qml_FOUND)
+if(Qt6Qml_FOUND)
 set(dice_header_qobject qmltypesregister.h diceroller.h)
 set(dice_source_qobject qmltypesregister.cpp diceroller.cpp)
 set(CMAKE_AUTOMOC ON)
@@ -116,7 +116,7 @@ set(CMAKE_AUTOUIC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 add_library(diceparser_qobject SHARED ${dice_header_qobject} ${dice_source_qobject})
-target_link_libraries(diceparser_qobject PUBLIC Qt5::Core Qt5::Gui Qt5::Svg Qt5::Qml Qt5::Concurrent PRIVATE diceparser_shared)
+target_link_libraries(diceparser_qobject PUBLIC Qt6::Core Qt6::Gui Qt6::Svg Qt6::Qml Qt6::Concurrent PRIVATE diceparser_shared)
 message("Messages diceparser ${CMAKE_CURRENT_SOURCE_DIR}/include")
 target_include_directories(diceparser_qobject PRIVATE include ./ ${CMAKE_CURRENT_SOURCE_DIR}/include)
 endif()
diff --git a/cli/CMakeLists.txt b/cli/CMakeLists.txt
index 5c666bc..7260ab6 100644
--- a/cli/CMakeLists.txt
+++ b/cli/CMakeLists.txt
@@ -50,7 +50,7 @@ if(Qt5Core_FOUND)
     MESSAGE(status  "find" ${dice_TS} ${translate_SRCS} )
     QT5_ADD_RESOURCES(dice_RESOURCES_RCC ${dice_RESOURCES})
     set(QT_PLUGINS_DIR "${Qt5Core_DIR}/../../../plugins")
-    get_target_property(QT_LIBRARY_DIR Qt5::Core LOCATION)
+    get_target_property(QT_LIBRARY_DIR Qt6::Core LOCATION)
     get_filename_component(QT_LIBRARY_DIR ${QT_LIBRARY_DIR} PATH)
 endif()
 
@@ -66,8 +66,8 @@ set(diceparser_shared_INCLUDE_DIRS "../diceparser")
 target_include_directories(dice PRIVATE ../include ../ ../result ../node)
 link_directories(BEFORE ${CMAKE_BINARY_DIR})
 IF(NO_PAINTER_OPERATOR)
-    target_link_libraries(dice PUBLIC Qt5::Core Qt5::Svg PRIVATE diceparser_shared)
+    target_link_libraries(dice PUBLIC Qt6::Core Qt6::Svg PRIVATE diceparser_shared)
 ELSE()
-    target_link_libraries(dice PUBLIC Qt5::Core Qt5::Gui Qt5::Svg PRIVATE diceparser_shared)
+    target_link_libraries(dice PUBLIC Qt6::Core Qt6::Gui Qt6::Svg PRIVATE diceparser_shared)
 ENDIF()
 INSTALL_TARGETS(/bin dice)
diff --git a/irc/CMakeLists.txt b/irc/CMakeLists.txt
index fc6dc6d..c38c5b6 100644
--- a/irc/CMakeLists.txt
+++ b/irc/CMakeLists.txt
@@ -33,5 +33,5 @@ link_directories(BEFORE ${CMAKE_BINARY_DIR})
 
 
 
-target_link_libraries(dirc PUBLIC Qt5::Core Qt5::Gui Qt5::Svg Qt5::Widgets Qt5::Network PRIVATE diceparser_shared)
+target_link_libraries(dirc PUBLIC Qt6::Core Qt6::Gui Qt6::Svg Qt6::Widgets Qt6::Network PRIVATE diceparser_shared)
 INSTALL_TARGETS(/bin dirc)
diff --git a/mobile/CMakeLists.txt b/mobile/CMakeLists.txt
index 9d07f9a..7cfc9c4 100644
--- a/mobile/CMakeLists.txt
+++ b/mobile/CMakeLists.txt
@@ -52,7 +52,7 @@ if(Qt5Core_FOUND)
 
     # guess plugins and libraries directory
     set(QT_PLUGINS_DIR "${Qt5Core_DIR}/../../../plugins")
-    get_target_property(QT_LIBRARY_DIR Qt5::Core LOCATION)
+    get_target_property(QT_LIBRARY_DIR Qt6::Core LOCATION)
     get_filename_component(QT_LIBRARY_DIR ${QT_LIBRARY_DIR} PATH)
 endif()
 
diff --git a/tests/dice/CMakeLists.txt b/tests/dice/CMakeLists.txt
index e2e580a..35f255b 100644
--- a/tests/dice/CMakeLists.txt
+++ b/tests/dice/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-permissive -pedantic -Wall -Wextra")
 set(CMAKE_AUTOMOC ON)
-find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED COMPONENTS Core Gui Svg Test)
+find_package(Qt6 ${QT_REQUIRED_VERSION} CONFIG REQUIRED COMPONENTS Core Gui Svg Test)
 
 set(test_source testnode.cpp tst_dice.cpp)
 
@@ -10,5 +10,5 @@ target_include_directories(test_dice PRIVATE ../../include ../../ ../../node ../
 
 find_library(DICEPARSER_LIBRARY diceparser HINTS ${CMAKE_CURRENT_BINARY_DIR}/../../)
 
-target_link_libraries(test_dice PUBLIC Qt5::Core Qt5::Gui Qt5::Test diceparser_shared)
+target_link_libraries(test_dice PUBLIC Qt6::Core Qt6::Gui Qt6::Test diceparser_shared)
 add_test(tst_diceparser test_dice)
diff --git a/tests/fuzzer/CMakeLists.txt b/tests/fuzzer/CMakeLists.txt
index a3d4e7c..ae9242d 100644
--- a/tests/fuzzer/CMakeLists.txt
+++ b/tests/fuzzer/CMakeLists.txt
@@ -22,5 +22,5 @@ set(fdsource testcase.cpp)
 add_executable(fuzzTestCase ${fdsource} )
 
 
-target_link_libraries(fuzzTestCase libdiceparser.a Qt5::Core Qt5::Gui Qt5::Svg Qt5::Concurrent)
+target_link_libraries(fuzzTestCase libdiceparser.a Qt6::Core Qt6::Gui Qt6::Svg Qt6::Concurrent)
 #target_link_libraries(fuzzTestCase )