From 5beb9d4e0d6df6ba0f50dcae9b3d4252e4dfb2da Mon Sep 17 00:00:00 2001
From: Elvis Lee <kwangwoong.lee@lge.com>
Date: Wed, 30 Dec 2020 16:56:33 +0900
Subject: [PATCH] Export wayland-egl client hwintegration

Support wayland-egl client hwintegration
as a module for external build.

Change-Id: I3e82838d0cc89d4bb1435b835dc1e9b592319ddf
Reviewed-by: Elvis Lee <kwangwoong.lee@lge.com>
Reviewed-by: Jaeyoon Jung <jaeyoon.jung@lge.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
---
 src/platformsupport/wayland/CMakeLists.txt           |  1 +
 .../hardwareintegration/wayland-egl/CMakeLists.txt   | 12 +-----------
 .../plugins/hardwareintegration/wayland-egl/main.cpp |  2 +-
 3 files changed, 3 insertions(+), 12 deletions(-)

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:<TRUE>:
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 <QtWaylandClient/private/qwaylandclientbufferintegrationplugin_p.h>
-#include "qwaylandeglclientbufferintegration.h"
+#include <QtWaylandEglClientHwIntegration/private/qwaylandeglclientbufferintegration_p.h>
 
 QT_BEGIN_NAMESPACE