diff --git a/src/platformsupport/wayland/CMakeLists.txt b/src/platformsupport/wayland/CMakeLists.txt index 8e60f0ba8f5..d970fcf5250 100644 --- a/src/platformsupport/wayland/CMakeLists.txt +++ b/src/platformsupport/wayland/CMakeLists.txt @@ -52,6 +52,7 @@ if (QT_FEATURE_wayland_server) endif() if (QT_FEATURE_wayland_server OR QT_FEATURE_wayland_client) + add_subdirectory(hardwareintegration) add_subdirectory(plugins) add_subdirectory(imports) endif() diff --git a/src/plugins/platforms/wayland/plugins/hardwareintegration/wayland-egl/CMakeLists.txt b/src/plugins/platforms/wayland/plugins/hardwareintegration/wayland-egl/CMakeLists.txt index 1742f1173a8..5baeb7168a4 100644 --- a/src/plugins/platforms/wayland/plugins/hardwareintegration/wayland-egl/CMakeLists.txt +++ b/src/plugins/platforms/wayland/plugins/hardwareintegration/wayland-egl/CMakeLists.txt @@ -9,22 +9,12 @@ qt_internal_add_plugin(QWaylandEglClientBufferPlugin OUTPUT_NAME qt-plugin-wayland-egl TYPE wayland-graphics-integration-client SOURCES - ../../../../hardwareintegration/client/wayland-egl/qwaylandeglclientbufferintegration.cpp ../../../../hardwareintegration/client/wayland-egl/qwaylandeglclientbufferintegration.h - ../../../../hardwareintegration/client/wayland-egl/qwaylandeglinclude.h - ../../../../hardwareintegration/client/wayland-egl/qwaylandeglwindow.cpp ../../../../hardwareintegration/client/wayland-egl/qwaylandeglwindow.h - ../../../../hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp ../../../../hardwareintegration/client/wayland-egl/qwaylandglcontext.h main.cpp - INCLUDE_DIRECTORIES - ../../../../hardwareintegration/client/wayland-egl PUBLIC_LIBRARIES - ${CMAKE_DL_LIBS} - EGL::EGL Qt::Core Qt::Gui - Qt::OpenGLPrivate Qt::WaylandClientPrivate - Wayland::Client - Wayland::Egl + Qt::WaylandEglClientHwIntegrationPrivate ) #### Keys ignored in scope 1:.:.:wayland-egl.pro:: diff --git a/src/plugins/platforms/wayland/plugins/hardwareintegration/wayland-egl/main.cpp b/src/plugins/platforms/wayland/plugins/hardwareintegration/wayland-egl/main.cpp index 0890635536f..11bf5806324 100644 --- a/src/plugins/platforms/wayland/plugins/hardwareintegration/wayland-egl/main.cpp +++ b/src/plugins/platforms/wayland/plugins/hardwareintegration/wayland-egl/main.cpp @@ -38,7 +38,7 @@ ****************************************************************************/ #include -#include "qwaylandeglclientbufferintegration.h" +#include QT_BEGIN_NAMESPACE