From eacf0c8d644fac8c7e7171b17ea1f8e0917ba68e Mon Sep 17 00:00:00 2001 From: John Preston Date: Mon, 8 Aug 2022 09:39:29 +0300 Subject: [PATCH] Revert "Use QtWaylandEglClientHwIntegrationPrivate module" This reverts commit 3e6a8fc1924bea4d886867515b56003c88287867. --- external/qt/package.cmake | 2 +- external/qt/qt6/CMakeLists.txt | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/external/qt/package.cmake b/external/qt/package.cmake index 780a876..88bb825 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 WaylandEglClientHwIntegrationPrivate REQUIRED) + find_package(Qt6 COMPONENTS WaylandClient 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 afc27f5..d2b5eef 100644 --- a/external/qt/qt6/CMakeLists.txt +++ b/external/qt/qt6/CMakeLists.txt @@ -35,7 +35,6 @@ if (DESKTOP_APP_USE_PACKAGED) INTERFACE Qt6::WaylandClient Qt6::WaylandClientPrivate - Qt6::WaylandEglClientHwIntegrationPrivate ) if (Qt6WaylandGlobalPrivate_FOUND) @@ -79,13 +78,10 @@ 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() @@ -116,7 +112,6 @@ if (LINUX AND NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION) INTERFACE QT_WAYLANDCLIENT_LIB QT_WAYLANDGLOBAL_LIB - QT_WAYLAND_EGL_CLIENT_HW_INTEGRATION_LIB ) endif()