Update for Qt 6.3

desktop-app · Apr 13, 2022 · ed1411f · ed1411f
1 parent b30865c
commit ed1411f
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 14 deletions.
diff --git a/external/qt/package.cmake b/external/qt/package.cmake
@@ -6,7 +6,7 @@
 
 if (NOT DESKTOP_APP_USE_PACKAGED)
     if (DESKTOP_APP_QT6)
-        set(qt_version 6.2.4)
+        set(qt_version 6.3.0)
     else()
         set(qt_version 5.15.3)
     endif()
@@ -32,6 +32,7 @@ if (LINUX)
     if (NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
         if (DESKTOP_APP_QT6)
             find_package(Qt6 COMPONENTS WaylandClient REQUIRED)
+            find_package(Qt6 OPTIONAL_COMPONENTS WaylandGlobalPrivate QUIET)
         else()
             find_package(Qt5 COMPONENTS WaylandClient REQUIRED)
             find_package(Qt5 OPTIONAL_COMPONENTS XkbCommonSupport QUIET)

diff --git a/external/qt/qt6/CMakeLists.txt b/external/qt/qt6/CMakeLists.txt
@@ -11,32 +11,37 @@ if (DESKTOP_APP_USE_PACKAGED)
     target_link_libraries(external_qt
     INTERFACE
         Qt6::Core
+        Qt6::CorePrivate
         Qt6::Core5Compat
         Qt6::Gui
+        Qt6::GuiPrivate
         Qt6::OpenGL
         Qt6::Widgets
         Qt6::OpenGLWidgets
         Qt6::Network
         Qt6::Svg
     )
 
-    target_include_directories(external_qt SYSTEM
-    INTERFACE
-        ${Qt6Core_PRIVATE_INCLUDE_DIRS}
-        ${Qt6Gui_PRIVATE_INCLUDE_DIRS}
-    )
-
     if (Qt6DBus_FOUND)
-        target_link_libraries(external_qt INTERFACE Qt6::DBus)
+        target_link_libraries(external_qt
+        INTERFACE
+            Qt6::DBus
+        )
     endif()
 
     if (LINUX AND NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
-        target_link_libraries(external_qt INTERFACE Qt6::WaylandClient)
-
-        target_include_directories(external_qt SYSTEM
+        target_link_libraries(external_qt
         INTERFACE
-            ${Qt6WaylandClient_PRIVATE_INCLUDE_DIRS}
+            Qt6::WaylandClient
+            Qt6::WaylandClientPrivate
         )
+
+        if (Qt6WaylandGlobalPrivate_FOUND)
+            target_link_libraries(external_qt
+            INTERFACE
+                Qt6::WaylandGlobalPrivate
+            )
+        endif()
     endif()
 
     return()
@@ -69,8 +74,11 @@ if (LINUX AND NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
     target_include_directories(external_qt SYSTEM
     INTERFACE
         ${qt_loc}/include/QtWaylandClient
+        ${qt_loc}/include/QtWaylandGlobal
         ${qt_loc}/include/QtWaylandClient/${qt_version}
+        ${qt_loc}/include/QtWaylandGlobal/${qt_version}
         ${qt_loc}/include/QtWaylandClient/${qt_version}/QtWaylandClient
+        ${qt_loc}/include/QtWaylandGlobal/${qt_version}/QtWaylandGlobal
     )
 endif()
 
@@ -100,6 +108,7 @@ if (LINUX AND NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
     target_compile_definitions(external_qt
     INTERFACE
         QT_WAYLANDCLIENT_LIB
+        QT_WAYLANDGLOBAL_LIB
     )
 endif()
 
@@ -252,7 +261,6 @@ if (LINUX)
     target_link_static_libraries(external_qt
     INTERFACE
         proxy
-        epoxy
         xkbcommon
         xkbcommon-x11
         xcb-glx
@@ -263,7 +271,6 @@ if (LINUX)
         xcb-render
         xcb-image
         xcb-xfixes
-        xcb-xinput
         xcb-shape
         xcb-sync
         xcb-util
@@ -281,8 +288,11 @@ if (LINUX)
         desktop-app::linux_xcb_helper
         fontconfig
         freetype
+        EGL
+        GL
         xcb
         X11
         X11-xcb
+        glib-2.0
     )
 endif()