kotatogram/cmake_helpers
1
0
Fork 0
Code Issues Activity

Revert "Use QtWaylandEglClientHwIntegrationPrivate module"

Browse source 
This reverts commit 3e6a8fc192.
This commit is contained in:
John Preston 2022-08-08 09:39:29 +03:00
parent f1c9743790
commit eacf0c8d64
2 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
external/qt/package.cmake vendored
View file

@ -31,7 +31,7 @@ endif()
if (LINUX) if (LINUX)
if (NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION) if (NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
if (DESKTOP_APP_QT6) if (DESKTOP_APP_QT6)
find_package(Qt6 COMPONENTS WaylandClient WaylandEglClientHwIntegrationPrivate REQUIRED) find_package(Qt6 COMPONENTS WaylandClient REQUIRED)
find_package(Qt6 OPTIONAL_COMPONENTS WaylandGlobalPrivate QUIET) find_package(Qt6 OPTIONAL_COMPONENTS WaylandGlobalPrivate QUIET)
else() else()
find_package(Qt5 COMPONENTS WaylandClient REQUIRED) find_package(Qt5 COMPONENTS WaylandClient REQUIRED)

5
external/qt/qt6/CMakeLists.txt vendored
View file

@ -35,7 +35,6 @@ if (DESKTOP_APP_USE_PACKAGED)
INTERFACE INTERFACE
Qt6::WaylandClient Qt6::WaylandClient
Qt6::WaylandClientPrivate Qt6::WaylandClientPrivate
Qt6::WaylandEglClientHwIntegrationPrivate
) )
if (Qt6WaylandGlobalPrivate_FOUND) if (Qt6WaylandGlobalPrivate_FOUND)
@ -79,13 +78,10 @@ if (LINUX AND NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
INTERFACE INTERFACE
${qt_loc}/include/QtWaylandClient ${qt_loc}/include/QtWaylandClient
${qt_loc}/include/QtWaylandGlobal ${qt_loc}/include/QtWaylandGlobal
${qt_loc}/include/QtWaylandEglClientHwIntegration
${qt_loc}/include/QtWaylandClient/${qt_version} ${qt_loc}/include/QtWaylandClient/${qt_version}
${qt_loc}/include/QtWaylandGlobal/${qt_version} ${qt_loc}/include/QtWaylandGlobal/${qt_version}
${qt_loc}/include/QtWaylandEglClientHwIntegration/${qt_version}
${qt_loc}/include/QtWaylandClient/${qt_version}/QtWaylandClient ${qt_loc}/include/QtWaylandClient/${qt_version}/QtWaylandClient
${qt_loc}/include/QtWaylandGlobal/${qt_version}/QtWaylandGlobal ${qt_loc}/include/QtWaylandGlobal/${qt_version}/QtWaylandGlobal
${qt_loc}/include/QtWaylandEglClientHwIntegration/${qt_version}/QtWaylandEglClientHwIntegration
) )
endif() endif()
@ -116,7 +112,6 @@ if (LINUX AND NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
INTERFACE INTERFACE
QT_WAYLANDCLIENT_LIB QT_WAYLANDCLIENT_LIB
QT_WAYLANDGLOBAL_LIB QT_WAYLANDGLOBAL_LIB
QT_WAYLAND_EGL_CLIENT_HW_INTEGRATION_LIB
) )
endif() endif()