From 3e6a8fc1924bea4d886867515b56003c88287867 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Thu, 4 Aug 2022 07:21:01 +0400 Subject: [PATCH] Use QtWaylandEglClientHwIntegrationPrivate module --- external/qt/package.cmake | 2 +- external/qt/qt6/CMakeLists.txt | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/external/qt/package.cmake b/external/qt/package.cmake index 88bb825..780a876 100644 --- a/external/qt/package.cmake +++ b/external/qt/package.cmake @@ -31,7 +31,7 @@ endif() if (LINUX) if (NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION) if (DESKTOP_APP_QT6) - find_package(Qt6 COMPONENTS WaylandClient REQUIRED) + find_package(Qt6 COMPONENTS WaylandClient WaylandEglClientHwIntegrationPrivate REQUIRED) find_package(Qt6 OPTIONAL_COMPONENTS WaylandGlobalPrivate QUIET) else() find_package(Qt5 COMPONENTS WaylandClient REQUIRED) diff --git a/external/qt/qt6/CMakeLists.txt b/external/qt/qt6/CMakeLists.txt index ebfd669..e5fc246 100644 --- a/external/qt/qt6/CMakeLists.txt +++ b/external/qt/qt6/CMakeLists.txt @@ -35,6 +35,7 @@ if (DESKTOP_APP_USE_PACKAGED) INTERFACE Qt6::WaylandClient Qt6::WaylandClientPrivate + Qt6::WaylandEglClientHwIntegrationPrivate ) if (Qt6WaylandGlobalPrivate_FOUND) @@ -78,10 +79,13 @@ if (LINUX AND NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION) INTERFACE ${qt_loc}/include/QtWaylandClient ${qt_loc}/include/QtWaylandGlobal + ${qt_loc}/include/QtWaylandEglClientHwIntegration ${qt_loc}/include/QtWaylandClient/${qt_version} ${qt_loc}/include/QtWaylandGlobal/${qt_version} + ${qt_loc}/include/QtWaylandEglClientHwIntegration/${qt_version} ${qt_loc}/include/QtWaylandClient/${qt_version}/QtWaylandClient ${qt_loc}/include/QtWaylandGlobal/${qt_version}/QtWaylandGlobal + ${qt_loc}/include/QtWaylandEglClientHwIntegration/${qt_version}/QtWaylandEglClientHwIntegration ) endif() @@ -112,6 +116,7 @@ if (LINUX AND NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION) INTERFACE QT_WAYLANDCLIENT_LIB QT_WAYLANDGLOBAL_LIB + QT_WAYLAND_EGL_CLIENT_HW_INTEGRATION_LIB ) endif()