Introduce Qt 6 compatibility

7 files changed, 29 insertions, 12 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ec3a4cac..2880f32f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,19 @@ set(SO_VERSION 3)
 set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake/modules")
 
-find_package(Qt5 5.7.0 REQUIRED COMPONENTS Core Network Xml)
+# prefer Qt6
+find_package(Qt6 COMPONENTS Core Network Xml)
+if(NOT Qt6_FOUND)
+    find_package(Qt5 5.7.0 REQUIRED COMPONENTS Core Network Xml)
+endif()
+
+# target names have changed from Qt5::Core -> Qt::Core
+if(Qt6_FOUND)
+    set(QT_TARGET Qt)
+else()
+    set(QT_TARGET Qt5)
+endif()
+
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 
diff --git a/examples/example_9_vCard/CMakeLists.txt b/examples/example_9_vCard/CMakeLists.txt
index 8b4a95c9..f21139b9 100644
--- a/examples/example_9_vCard/CMakeLists.txt
+++ b/examples/example_9_vCard/CMakeLists.txt
@@ -1,4 +1,7 @@
-find_package(Qt5 REQUIRED COMPONENTS Gui)
+find_package(Qt6 COMPONENTS Gui)
+if(NOT Qt6_FOUND)
+    find_package(Qt5 REQUIRED Gui)
+endif()
 
 add_executable(9_vCard example_9_vCard.cpp)
-target_link_libraries(9_vCard Qt5::Gui qxmpp)
+target_link_libraries(9_vCard ${QT_TARGET}::Gui qxmpp)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 64c7d772..fd50d39d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -233,9 +233,9 @@ target_include_directories(qxmpp
 
 target_link_libraries(qxmpp
     PUBLIC
-    Qt5::Core
-    Qt5::Network
-    Qt5::Xml
+    ${QT_TARGET}::Core
+    ${QT_TARGET}::Network
+    ${QT_TARGET}::Xml
 )
 
 if(WITH_GSTREAMER)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 04c160fa..95134421 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,11 +1,14 @@
 include_directories(.)
 
-find_package(Qt5 REQUIRED COMPONENTS Test)
+find_package(Qt6 COMPONENTS Test)
+if(NOT Qt6_FOUND)
+    find_package(Qt5 REQUIRED COMPONENTS Test)
+endif()
 
 macro(add_simple_test TEST_NAME)
     add_executable(tst_${TEST_NAME} ${TEST_NAME}/tst_${TEST_NAME}.cpp)
     add_test(tst_${TEST_NAME} tst_${TEST_NAME})
-    target_link_libraries(tst_${TEST_NAME} Qt5::Test qxmpp)
+    target_link_libraries(tst_${TEST_NAME} ${QT_TARGET}::Test qxmpp)
 endmacro()
 
 include_directories(${PROJECT_SOURCE_DIR}/src/base)
@@ -66,4 +69,3 @@ endif()
 add_subdirectory(qxmpptransfermanager)
 add_subdirectory(qxmpputils)
 add_subdirectory(qxmppuploadrequestmanager)
-
diff --git a/tests/qxmpptransfermanager/CMakeLists.txt b/tests/qxmpptransfermanager/CMakeLists.txt
index 31bc5633..9648e694 100644
--- a/tests/qxmpptransfermanager/CMakeLists.txt
+++ b/tests/qxmpptransfermanager/CMakeLists.txt
@@ -1,4 +1,4 @@
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 add_executable(tst_qxmpptransfermanager tst_qxmpptransfermanager.cpp tst_qxmpptransfermanager.qrc)
 add_test(tst_qxmpptransfermanager tst_qxmpptransfermanager)
-target_link_libraries(tst_qxmpptransfermanager Qt5::Test qxmpp)
+target_link_libraries(tst_qxmpptransfermanager ${QT_TARGET}::Test qxmpp)
diff --git a/tests/qxmppuploadrequestmanager/CMakeLists.txt b/tests/qxmppuploadrequestmanager/CMakeLists.txt
index 197cca0a..9e74f754 100644
--- a/tests/qxmppuploadrequestmanager/CMakeLists.txt
+++ b/tests/qxmppuploadrequestmanager/CMakeLists.txt
@@ -1,4 +1,4 @@
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 add_executable(tst_qxmppuploadrequestmanager tst_qxmppuploadrequestmanager.cpp tst_qxmppuploadrequestmanager.qrc)
 add_test(tst_qxmppuploadrequestmanager tst_qxmppuploadrequestmanager)
-target_link_libraries(tst_qxmppuploadrequestmanager Qt5::Test qxmpp)
+target_link_libraries(tst_qxmppuploadrequestmanager ${QT_TARGET}::Test qxmpp)
diff --git a/tests/qxmpputils/CMakeLists.txt b/tests/qxmpputils/CMakeLists.txt
index db208306..24cf90f0 100644
--- a/tests/qxmpputils/CMakeLists.txt
+++ b/tests/qxmpputils/CMakeLists.txt
@@ -1,4 +1,4 @@
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 add_executable(tst_qxmpputils tst_qxmpputils.cpp tst_qxmpputils.qrc)
 add_test(tst_qxmpputils tst_qxmpputils)
-target_link_libraries(tst_qxmpputils Qt5::Test qxmpp)
+target_link_libraries(tst_qxmpputils ${QT_TARGET}::Test qxmpp)