Remove last remaining bits of QtPlatformHeaders

Task-number: QTBUG-84220
Change-Id: I951e04bfe9358a99951d1d61ff47b675584b7f81
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>

8 files changed, 10 insertions, 79 deletions

diff --git a/src/plugins/platforms/eglfs/.prev_CMakeLists.txt b/src/plugins/platforms/eglfs/.prev_CMakeLists.txt
index 871f1b4065..2fbaf4d018 100644
--- a/src/plugins/platforms/eglfs/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/eglfs/.prev_CMakeLists.txt
@@ -24,7 +24,6 @@ qt_add_module(EglFSDeviceIntegration
         Qt::DeviceDiscoverySupportPrivate
         Qt::FbSupportPrivate
         Qt::GuiPrivate
-        Qt::PlatformHeadersPrivate
 )
 
 #### Keys ignored in scope 2:.:.:eglfsdeviceintegration.pro:<TRUE>:
@@ -91,7 +90,6 @@ 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 d6de0cd6a1..f74a15f9e6 100644
--- a/src/plugins/platforms/eglfs/CMakeLists.txt
+++ b/src/plugins/platforms/eglfs/CMakeLists.txt
@@ -25,7 +25,6 @@ qt_add_module(EglFSDeviceIntegration
         Qt::DeviceDiscoverySupportPrivate
         Qt::FbSupportPrivate
         Qt::GuiPrivate
-        Qt::PlatformHeadersPrivate
         EGL::EGL # special case
 )
 
@@ -98,7 +97,6 @@ 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 befab97baa..9850fa8b75 100644
--- a/src/plugins/platforms/eglfs/api/qeglfsintegration.cpp
+++ b/src/plugins/platforms/eglfs/api/qeglfsintegration.cpp
@@ -94,8 +94,6 @@
 #include <QtInputSupport/qintegrityhidmanager.h>
 #endif
 
-#include <QtPlatformHeaders/private/qeglfsfunctions_p.h>
-
 static void initResources()
 {
 #ifndef QT_NO_CURSOR
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 7e8462eb4c..dbcbe589ea 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,6 @@
 #include <QtCore/QJsonArray>
 #include <QtGui/qpa/qplatformwindow.h>
 #include <QtGui/QScreen>
-#include <QtPlatformHeaders/private/qeglfsfunctions_p.h>
 
 #include <xf86drm.h>
 #include <xf86drmMode.h>
@@ -123,24 +122,6 @@ void QEglFSKmsVsp2Integration::presentBuffer(QPlatformSurface *surface)
     screen->flip();
 }
 
-QFunctionPointer QEglFSKmsVsp2Integration::platformFunction(const QByteArray &function) const
-{
-    if (function == QEglFSFunctions::vsp2AddLayerTypeIdentifier())
-        return QFunctionPointer(addLayerStatic);
-    if (function == QEglFSFunctions::vsp2RemoveLayerTypeIdentifier())
-        return QFunctionPointer(removeLayerStatic);
-    if (function == QEglFSFunctions::vsp2SetLayerBufferTypeIdentifier())
-        return QFunctionPointer(setLayerBufferStatic);
-    if (function == QEglFSFunctions::vsp2SetLayerPositionTypeIdentifier())
-        return QFunctionPointer(setLayerPositionStatic);
-    if (function == QEglFSFunctions::vsp2SetLayerAlphaTypeIdentifier())
-        return QFunctionPointer(setLayerAlphaStatic);
-    if (function == QEglFSFunctions::vsp2AddBlendListenerTypeIdentifier())
-        return QFunctionPointer(addBlendListenerStatic);
-
-    return nullptr;
-}
-
 QKmsDevice *QEglFSKmsVsp2Integration::createDevice()
 {
     QString path = screenConfig()->devicePath();
@@ -162,42 +143,6 @@ QKmsDevice *QEglFSKmsVsp2Integration::createDevice()
     return new QEglFSKmsVsp2Device(screenConfig(), path);
 }
 
-int QEglFSKmsVsp2Integration::addLayerStatic(const QScreen *screen, int dmabufFd, const QSize &size, const QPoint &position, uint pixelFormat, uint bytesPerLine)
-{
-    auto vsp2Screen = static_cast<QEglFSKmsVsp2Screen *>(screen->handle());
-    return vsp2Screen->addLayer(dmabufFd, size, position, pixelFormat, bytesPerLine);
-}
-
-bool QEglFSKmsVsp2Integration::removeLayerStatic(const QScreen *screen, int id)
-{
-    auto vsp2Screen = static_cast<QEglFSKmsVsp2Screen *>(screen->handle());
-    return vsp2Screen->removeLayer(id);
-}
-
-void QEglFSKmsVsp2Integration::setLayerBufferStatic(const QScreen *screen, int id, int dmabufFd)
-{
-    auto vsp2Screen = static_cast<QEglFSKmsVsp2Screen *>(screen->handle());
-    vsp2Screen->setLayerBuffer(id, dmabufFd);
-}
-
-void QEglFSKmsVsp2Integration::setLayerPositionStatic(const QScreen *screen, int id, const QPoint &position)
-{
-    auto vsp2Screen = static_cast<QEglFSKmsVsp2Screen *>(screen->handle());
-    vsp2Screen->setLayerPosition(id, position);
-}
-
-void QEglFSKmsVsp2Integration::setLayerAlphaStatic(const QScreen *screen, int id, qreal alpha)
-{
-    auto vsp2Screen = static_cast<QEglFSKmsVsp2Screen *>(screen->handle());
-    vsp2Screen->setLayerAlpha(id, alpha);
-}
-
-void QEglFSKmsVsp2Integration::addBlendListenerStatic(const QScreen *screen, void(*callback)())
-{
-    auto vsp2Screen = static_cast<QEglFSKmsVsp2Screen *>(screen->handle());
-    vsp2Screen->addBlendListener(callback);
-}
-
 class QEglFSKmsVsp2Window : public QEglFSWindow
 {
 public:
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_vsp2/qeglfskmsvsp2integration.h b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_vsp2/qeglfskmsvsp2integration.h
index b1a8a2edf3..a67d05488c 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_vsp2/qeglfskmsvsp2integration.h
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_vsp2/qeglfskmsvsp2integration.h
@@ -62,18 +62,8 @@ public:
     void presentBuffer(QPlatformSurface *surface) override;
     QEglFSWindow *createWindow(QWindow *window) const override;
 
-    QFunctionPointer platformFunction(const QByteArray &function) const override;
-
 protected:
     QKmsDevice *createDevice() override;
-
-private:
-    static int addLayerStatic(const QScreen *screen, int dmabufFd, const QSize &size, const QPoint &position, uint pixelFormat, uint bytesPerLine);
-    static bool removeLayerStatic(const QScreen *screen, int id);
-    static void setLayerBufferStatic(const QScreen *screen, int id, int dmabufFd);
-    static void setLayerPositionStatic(const QScreen *screen, int id, const QPoint &position);
-    static void setLayerAlphaStatic(const QScreen *screen, int id, qreal alpha);
-    static void addBlendListenerStatic(const QScreen *screen, void(*callback)());
 };
 
 QT_END_NAMESPACE
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_vsp2/qeglfskmsvsp2screen.h b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_vsp2/qeglfskmsvsp2screen.h
index 9aa23d90a6..369d175bcf 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_vsp2/qeglfskmsvsp2screen.h
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_vsp2/qeglfskmsvsp2screen.h
@@ -46,11 +46,14 @@
 #include "qvsp2blendingdevice.h"
 #include <QtCore/QMutex>
 
+#include <qpa/qplatformscreen_p.h>
+
 #include <gbm.h>
 
 QT_BEGIN_NAMESPACE
 
 class QEglFSKmsVsp2Screen : public QEglFSKmsScreen
+    , public QPlatformInterface::Private::QVsp2Screen
 {
 public:
     QEglFSKmsVsp2Screen(QEglFSKmsDevice *device, const QKmsOutput &output);
@@ -63,12 +66,12 @@ public:
     void initQtLayer();
 
     //TODO: use a fixed index API instead of auto increment?
-    int addLayer(int dmabufFd, const QSize &size, const QPoint &position, uint drmPixelFormat, uint bytesPerLine);
-    void setLayerBuffer(int id, int dmabufFd);
-    void setLayerPosition(int id, const QPoint &position);
-    void setLayerAlpha(int id, qreal alpha);
-    bool removeLayer(int id);
-    void addBlendListener(void (*callback)());
+    int addLayer(int dmabufFd, const QSize &size, const QPoint &position, uint drmPixelFormat, uint bytesPerLine) override;
+    void setLayerBuffer(int id, int dmabufFd) override;
+    void setLayerPosition(int id, const QPoint &position) override;
+    void setLayerAlpha(int id, qreal alpha) override;
+    bool removeLayer(int id) override;
+    void addBlendListener(void (*callback)()) override;
 
     void flip();
     void blendAndFlipDrm();
diff --git a/src/plugins/platforms/eglfs/eglfs-plugin.pro b/src/plugins/platforms/eglfs/eglfs-plugin.pro
index d863abe000..ec229796e5 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 platformheaders-private
+QT += eglfsdeviceintegration-private
 
 CONFIG += egl
 
diff --git a/src/plugins/platforms/eglfs/eglfsdeviceintegration.pro b/src/plugins/platforms/eglfs/eglfsdeviceintegration.pro
index 2b611f8e69..720e35c226 100644
--- a/src/plugins/platforms/eglfs/eglfsdeviceintegration.pro
+++ b/src/plugins/platforms/eglfs/eglfsdeviceintegration.pro
@@ -10,7 +10,6 @@ MODULE = eglfsdeviceintegration
 
 QT += \
     core-private gui-private \
-    platformheaders-private \
     devicediscovery_support-private \
     fb_support-private