Adapt build system for building against Qt6

CMakeLists.txt

@@ -27,7 +27,11 @@ include(CheckIncludeFile)
 
 check_include_file("linux/input.h" HAVE_LINUX_INPUT_H)
 
-find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Core DBus Widgets X11Extras)
+find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} REQUIRED COMPONENTS Core DBus Widgets)
+
+if(QT_MAJOR_VERSION EQUAL "5")
+    find_package(Qt5X11Extras REQUIRED)
+endif()
 
 find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
     I18n
@@ -81,8 +85,8 @@ find_package(PlasmaWaylandProtocols 1.5.0)
 if(PipeWire_FOUND AND PlasmaWaylandProtocols_FOUND)
     find_package(KF5Wayland ${KF5_MIN_VERSION})
     find_package(QtWaylandScanner REQUIRED)
-    find_package(Qt5WaylandClient)
-    find_package(Qt5XkbCommonSupport)
+    find_package(Qt${QT_MAJOR_VERSION}WaylandClient)
+    find_package(Qt${QT_MAJOR_VERSION}XkbCommonSupport)
     find_package(Wayland REQUIRED COMPONENTS Client)
 endif()
 

events/xdp/CMakeLists.txt

@@ -7,7 +7,7 @@ set (krfb_events_xdp_SRCS
      xdpeventsplugin.cpp
 )
 
-qt5_add_dbus_interface(
+qt_add_dbus_interface(
    krfb_events_xdp_SRCS
    ${CMAKE_SOURCE_DIR}/dbus/xdp_dbus_remotedesktop_interface.xml
    xdp_dbus_remotedesktop_interface
@@ -18,7 +18,7 @@ add_library (krfb_events_xdp MODULE ${krfb_events_xdp_SRCS})
 target_link_libraries (krfb_events_xdp
                        KF5::CoreAddons
                        KF5::I18n
-                       Qt5::DBus
+                       Qt::DBus
                        krfbprivate
 )
 set_target_properties(krfb_events_xdp PROPERTIES OUTPUT_NAME xdp)

framebuffers/pipewire/CMakeLists.txt

@@ -22,13 +22,13 @@ ecm_qt_declare_logging_category(krfb_framebuffer_pw_SRCS
     EXPORT KRFB
 )
 
-qt5_add_dbus_interface(
+qt_add_dbus_interface(
    krfb_framebuffer_pw_SRCS
    ${CMAKE_SOURCE_DIR}/dbus/xdp_dbus_screencast_interface.xml
    xdp_dbus_screencast_interface
 )
 
-qt5_add_dbus_interface(
+qt_add_dbus_interface(
    krfb_framebuffer_pw_SRCS
    ${CMAKE_SOURCE_DIR}/dbus/xdp_dbus_remotedesktop_interface.xml
    xdp_dbus_remotedesktop_interface
@@ -41,9 +41,9 @@ add_library(krfb_framebuffer_pw
 set_property(TARGET krfb_framebuffer_pw PROPERTY C_STANDARD 99)
 
 target_link_libraries(krfb_framebuffer_pw
-                      Qt5::Core
-                      Qt5::Gui
-                      Qt5::DBus
+                      Qt::Core
+                      Qt::Gui
+                      Qt::DBus
                       KF5::CoreAddons
                       KF5::WaylandClient
                       Wayland::Client

framebuffers/qt/CMakeLists.txt

@@ -21,8 +21,8 @@ add_library(krfb_framebuffer_qt
 )
 
 target_link_libraries (krfb_framebuffer_qt
-                       Qt5::Core
-                       Qt5::Gui
+                       Qt::Core
+                       Qt::Gui
                        KF5::CoreAddons
                        krfbprivate
 )

framebuffers/xcb/CMakeLists.txt

@@ -18,8 +18,8 @@ ecm_qt_declare_logging_category(krfb_framebuffer_xcb_SRCS
 add_library(krfb_framebuffer_xcb MODULE ${krfb_framebuffer_xcb_SRCS})
 
 target_link_libraries (krfb_framebuffer_xcb
-                       Qt5::Core
-                       Qt5::Gui
+                       Qt::Core
+                       Qt::Gui
                        XCB::XCB
                        XCB::RENDER
                        XCB::SHAPE

krfb/CMakeLists.txt

@@ -23,13 +23,18 @@ generate_export_header(krfbprivate BASE_NAME krfbprivate)
 
 
 target_link_libraries (krfbprivate
-                       Qt5::Core
-                       Qt5::Widgets
-                       Qt5::X11Extras
+                       Qt::Core
+                       Qt::Widgets
                        ${X11_X11_LIB}
                        ${LIBVNCSERVER_LIBRARIES}
 )
 
+if(QT_MAJOR_VERSION EQUAL "5")
+    target_link_libraries (krfbprivate Qt::X11Extras)
+else()
+    target_link_libraries (krfbprivate Qt::GuiPrivate)
+endif()
+
 set_target_properties (krfbprivate PROPERTIES
                        VERSION 5
                        SOVERSION 5.0
@@ -80,7 +85,7 @@ ki18n_wrap_ui (krfb_UI_SRCS
                    ui/mainwidget.ui
 )
 
-qt5_add_resources(krfb_SRCS
+qt_add_resources(krfb_SRCS
     krfb.qrc
 )
 
@@ -95,7 +100,7 @@ target_link_libraries (krfb
                        ${X11_Xext_LIB}
                        ${X11_X11_LIB}
                        ${X11_Xdamage_LIB}
-                       Qt5::Network
+                       Qt::Network
                        KF5::CoreAddons
                        KF5::DBusAddons
                        KF5::DNSSD
@@ -135,8 +140,8 @@ add_executable(krfb-virtualmonitor main-virtualmonitor.cpp ${krfbvm_SRCS} ${krfb
                                    rfbserver.cpp rfbclient.cpp rfbservermanager.cpp eventsmanager.cpp framebuffermanager.cpp sockethelpers.cpp)
 target_link_libraries(krfb-virtualmonitor
                       krfbprivate
-                      Qt5::Gui
-                      Qt5::Network
+                      Qt::Gui
+                      Qt::Network
                       KF5::ConfigGui
                       KF5::CoreAddons
                       KF5::I18n