From 8dd6957cd7a1d86714b32b97dffe603a8636848a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@qt.io>
Date: Fri, 3 Jul 2020 15:40:47 +0200
Subject: Make QtPlatformHeaders a private module
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The APIs will be reintroduced as part of the new platform interface
API where appropriate.

Clients that still depend on the platform headers can include it
via QT += platformheaders-private.

Change-Id: Ifbd836d833d19f3cf48cd4f933d7fe754c06d2d9
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
---
 src/plugins/platforms/eglfs/.prev_CMakeLists.txt                        | 2 ++
 src/plugins/platforms/eglfs/CMakeLists.txt                              | 2 ++
 src/plugins/platforms/eglfs/api/qeglfsintegration.cpp                   | 2 +-
 .../eglfs/deviceintegration/eglfs_kms_vsp2/qeglfskmsvsp2integration.cpp | 2 +-
 src/plugins/platforms/eglfs/eglfs-plugin.pro                            | 2 +-
 src/plugins/platforms/eglfs/eglfsdeviceintegration.pro                  | 1 +
 6 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'src/plugins/platforms/eglfs')

diff --git a/src/plugins/platforms/eglfs/.prev_CMakeLists.txt b/src/plugins/platforms/eglfs/.prev_CMakeLists.txt
index 29e9f6d9b0..b774fb63f7 100644
--- a/src/plugins/platforms/eglfs/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/eglfs/.prev_CMakeLists.txt
@@ -25,6 +25,7 @@ qt_add_module(EglFSDeviceIntegration
         Qt::EglSupportPrivate
         Qt::FbSupportPrivate
         Qt::GuiPrivate
+        Qt::PlatformHeadersPrivate
 )
 
 #### Keys ignored in scope 2:.:.:eglfsdeviceintegration.pro:<TRUE>:
@@ -91,6 +92,7 @@ qt_internal_add_plugin(QEglFSIntegrationPlugin
         api
     PUBLIC_LIBRARIES
         Qt::EglFSDeviceIntegrationPrivate
+        Qt::PlatformHeadersPrivate
 )
 
 #### Keys ignored in scope 12:.:.:eglfs-plugin.pro:<TRUE>:
diff --git a/src/plugins/platforms/eglfs/CMakeLists.txt b/src/plugins/platforms/eglfs/CMakeLists.txt
index 88dc0edb8f..5473e9683f 100644
--- a/src/plugins/platforms/eglfs/CMakeLists.txt
+++ b/src/plugins/platforms/eglfs/CMakeLists.txt
@@ -26,6 +26,7 @@ qt_add_module(EglFSDeviceIntegration
         Qt::EglSupportPrivate
         Qt::FbSupportPrivate
         Qt::GuiPrivate
+        Qt::PlatformHeadersPrivate
         EGL::EGL # special case
 )
 
@@ -98,6 +99,7 @@ qt_internal_add_plugin(QEglFSIntegrationPlugin
     PUBLIC_LIBRARIES
         Qt::CorePrivate # special case
         Qt::EglFSDeviceIntegrationPrivate
+        Qt::PlatformHeadersPrivate
         EGL::EGL # special case
 )
 
diff --git a/src/plugins/platforms/eglfs/api/qeglfsintegration.cpp b/src/plugins/platforms/eglfs/api/qeglfsintegration.cpp
index c94a12a198..62b9c8a7c2 100644
--- a/src/plugins/platforms/eglfs/api/qeglfsintegration.cpp
+++ b/src/plugins/platforms/eglfs/api/qeglfsintegration.cpp
@@ -94,7 +94,7 @@
 #include <QtInputSupport/qintegrityhidmanager.h>
 #endif
 
-#include <QtPlatformHeaders/qeglfsfunctions.h>
+#include <QtPlatformHeaders/private/qeglfsfunctions_p.h>
 
 static void initResources()
 {
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_vsp2/qeglfskmsvsp2integration.cpp b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_vsp2/qeglfskmsvsp2integration.cpp
index d1250ec9bf..6aeb826fa5 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_vsp2/qeglfskmsvsp2integration.cpp
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_vsp2/qeglfskmsvsp2integration.cpp
@@ -52,7 +52,7 @@
 #include <QtCore/QJsonArray>
 #include <QtGui/qpa/qplatformwindow.h>
 #include <QtGui/QScreen>
-#include <QtPlatformHeaders/qeglfsfunctions.h>
+#include <QtPlatformHeaders/private/qeglfsfunctions_p.h>
 
 #include <xf86drm.h>
 #include <xf86drmMode.h>
diff --git a/src/plugins/platforms/eglfs/eglfs-plugin.pro b/src/plugins/platforms/eglfs/eglfs-plugin.pro
index ec229796e5..d863abe000 100644
--- a/src/plugins/platforms/eglfs/eglfs-plugin.pro
+++ b/src/plugins/platforms/eglfs/eglfs-plugin.pro
@@ -1,6 +1,6 @@
 TARGET = qeglfs
 
-QT += eglfsdeviceintegration-private
+QT += eglfsdeviceintegration-private platformheaders-private
 
 CONFIG += egl
 
diff --git a/src/plugins/platforms/eglfs/eglfsdeviceintegration.pro b/src/plugins/platforms/eglfs/eglfsdeviceintegration.pro
index 9bbaad04c6..85e0d48bc0 100644
--- a/src/plugins/platforms/eglfs/eglfsdeviceintegration.pro
+++ b/src/plugins/platforms/eglfs/eglfsdeviceintegration.pro
@@ -10,6 +10,7 @@ MODULE = eglfsdeviceintegration
 
 QT += \
     core-private gui-private \
+    platformheaders-private \
     devicediscovery_support-private \
     fb_support-private egl_support-private
 
-- 
cgit v1.2.3