diff options
Diffstat (limited to 'src/plugins/platforms')
22 files changed, 15 insertions, 98 deletions
diff --git a/src/plugins/platforms/cocoa/.prev_CMakeLists.txt b/src/plugins/platforms/cocoa/.prev_CMakeLists.txt index 0d2ed167b6..ee40e32033 100644 --- a/src/plugins/platforms/cocoa/.prev_CMakeLists.txt +++ b/src/plugins/platforms/cocoa/.prev_CMakeLists.txt @@ -58,7 +58,6 @@ qt_internal_add_plugin(QCocoaIntegrationPlugin Qt::CorePrivate Qt::Gui Qt::GuiPrivate - Qt::PlatformHeadersPrivate ) # Resources: diff --git a/src/plugins/platforms/cocoa/CMakeLists.txt b/src/plugins/platforms/cocoa/CMakeLists.txt index 8180787737..51d7038950 100644 --- a/src/plugins/platforms/cocoa/CMakeLists.txt +++ b/src/plugins/platforms/cocoa/CMakeLists.txt @@ -64,7 +64,6 @@ qt_internal_add_plugin(QCocoaIntegrationPlugin Qt::CorePrivate Qt::Gui Qt::GuiPrivate - Qt::PlatformHeadersPrivate ) # special case begin diff --git a/src/plugins/platforms/cocoa/cocoa.pro b/src/plugins/platforms/cocoa/cocoa.pro index e5a45612b8..742038d5cd 100644 --- a/src/plugins/platforms/cocoa/cocoa.pro +++ b/src/plugins/platforms/cocoa/cocoa.pro @@ -99,7 +99,7 @@ LIBS += -framework AppKit -framework CoreServices -framework Carbon -framework I DEFINES += QT_NO_FOREACH -QT += core-private gui-private platformheaders-private +QT += core-private gui-private CONFIG += no_app_extension_api_only diff --git a/src/plugins/platforms/direct2d/direct2d.pro b/src/plugins/platforms/direct2d/direct2d.pro index 9a8caac700..70e4ef497e 100644 --- a/src/plugins/platforms/direct2d/direct2d.pro +++ b/src/plugins/platforms/direct2d/direct2d.pro @@ -1,7 +1,7 @@ TARGET = qdirect2d QT += \ - core-private gui-private platformheaders-private + core-private gui-private LIBS += -ldwmapi -lversion -ld3d11 -ldxgi -ldxguid QMAKE_USE_PRIVATE += gdi32 dwrite_2 d2d1_1 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 diff --git a/src/plugins/platforms/linuxfb/.prev_CMakeLists.txt b/src/plugins/platforms/linuxfb/.prev_CMakeLists.txt index f3e5c13e6d..258b70603e 100644 --- a/src/plugins/platforms/linuxfb/.prev_CMakeLists.txt +++ b/src/plugins/platforms/linuxfb/.prev_CMakeLists.txt @@ -19,7 +19,6 @@ qt_internal_add_plugin(QLinuxFbIntegrationPlugin Qt::FbSupportPrivate Qt::Gui Qt::GuiPrivate - Qt::PlatformHeadersPrivate ) #### Keys ignored in scope 1:.:.:linuxfb.pro:<TRUE>: diff --git a/src/plugins/platforms/linuxfb/CMakeLists.txt b/src/plugins/platforms/linuxfb/CMakeLists.txt index b89354cdfd..ea5642f1c0 100644 --- a/src/plugins/platforms/linuxfb/CMakeLists.txt +++ b/src/plugins/platforms/linuxfb/CMakeLists.txt @@ -20,7 +20,6 @@ qt_internal_add_plugin(QLinuxFbIntegrationPlugin Qt::FbSupportPrivate Qt::Gui Qt::GuiPrivate - Qt::PlatformHeadersPrivate ) #### Keys ignored in scope 1:.:.:linuxfb.pro:<TRUE>: diff --git a/src/plugins/platforms/linuxfb/linuxfb.pro b/src/plugins/platforms/linuxfb/linuxfb.pro index df2831a0cd..08a4d6dd0c 100644 --- a/src/plugins/platforms/linuxfb/linuxfb.pro +++ b/src/plugins/platforms/linuxfb/linuxfb.pro @@ -4,7 +4,6 @@ DEFINES += QT_NO_FOREACH QT += \ core-private gui-private \ - platformheaders-private \ fb_support-private qtHaveModule(input_support-private): \ diff --git a/src/plugins/platforms/windows/.prev_CMakeLists.txt b/src/plugins/platforms/windows/.prev_CMakeLists.txt index d2df21f951..d3e488ed20 100644 --- a/src/plugins/platforms/windows/.prev_CMakeLists.txt +++ b/src/plugins/platforms/windows/.prev_CMakeLists.txt @@ -53,7 +53,6 @@ qt_internal_add_plugin(QWindowsIntegrationPlugin Qt::CorePrivate Qt::Gui Qt::GuiPrivate - Qt::PlatformHeadersPrivate dwmapi imm32 oleaut32 diff --git a/src/plugins/platforms/windows/CMakeLists.txt b/src/plugins/platforms/windows/CMakeLists.txt index 094717a8f8..fe12102811 100644 --- a/src/plugins/platforms/windows/CMakeLists.txt +++ b/src/plugins/platforms/windows/CMakeLists.txt @@ -54,7 +54,6 @@ qt_internal_add_plugin(QWindowsIntegrationPlugin Qt::CorePrivate Qt::Gui Qt::GuiPrivate - Qt::PlatformHeadersPrivate dwmapi imm32 oleaut32 diff --git a/src/plugins/platforms/windows/windows.pro b/src/plugins/platforms/windows/windows.pro index 283b332ee9..ea211beaef 100644 --- a/src/plugins/platforms/windows/windows.pro +++ b/src/plugins/platforms/windows/windows.pro @@ -1,7 +1,6 @@ TARGET = qwindows -QT += \ - core-private gui-private platformheaders-private +QT += core-private gui-private qtConfig(opengl): QT += opengl-private diff --git a/src/plugins/platforms/xcb/.prev_CMakeLists.txt b/src/plugins/platforms/xcb/.prev_CMakeLists.txt index 4ca2f75725..0cf401037e 100644 --- a/src/plugins/platforms/xcb/.prev_CMakeLists.txt +++ b/src/plugins/platforms/xcb/.prev_CMakeLists.txt @@ -42,7 +42,6 @@ qt_add_module(XcbQpa PkgConfig::XKB_COMMON_X11 Qt::CorePrivate Qt::GuiPrivate - Qt::PlatformHeadersPrivate XCB::ICCCM XCB::IMAGE XCB::KEYSYMS @@ -142,7 +141,6 @@ qt_internal_add_plugin(QXcbIntegrationPlugin PUBLIC_LIBRARIES Qt::CorePrivate Qt::GuiPrivate - Qt::PlatformHeadersPrivate Qt::XcbQpaPrivate ) diff --git a/src/plugins/platforms/xcb/CMakeLists.txt b/src/plugins/platforms/xcb/CMakeLists.txt index 9604e627cc..22a955fec6 100644 --- a/src/plugins/platforms/xcb/CMakeLists.txt +++ b/src/plugins/platforms/xcb/CMakeLists.txt @@ -42,7 +42,6 @@ qt_add_module(XcbQpa PkgConfig::XKB_COMMON_X11 Qt::CorePrivate Qt::GuiPrivate - Qt::PlatformHeadersPrivate XCB::ICCCM XCB::IMAGE XCB::KEYSYMS @@ -169,7 +168,6 @@ qt_internal_add_plugin(QXcbIntegrationPlugin PUBLIC_LIBRARIES Qt::CorePrivate Qt::GuiPrivate - Qt::PlatformHeadersPrivate Qt::XcbQpaPrivate ) diff --git a/src/plugins/platforms/xcb/xcb-plugin.pro b/src/plugins/platforms/xcb/xcb-plugin.pro index 90c26c2188..4c646d42c6 100644 --- a/src/plugins/platforms/xcb/xcb-plugin.pro +++ b/src/plugins/platforms/xcb/xcb-plugin.pro @@ -1,6 +1,6 @@ TARGET = qxcb -QT += core-private gui-private xcb_qpa_lib-private platformheaders-private +QT += core-private gui-private xcb_qpa_lib-private DEFINES += QT_NO_FOREACH diff --git a/src/plugins/platforms/xcb/xcb_qpa_lib.pro b/src/plugins/platforms/xcb/xcb_qpa_lib.pro index c77439220e..f44388cc6d 100644 --- a/src/plugins/platforms/xcb/xcb_qpa_lib.pro +++ b/src/plugins/platforms/xcb/xcb_qpa_lib.pro @@ -2,9 +2,7 @@ TARGET = QtXcbQpa CONFIG += no_module_headers internal_module DEFINES += QT_NO_FOREACH -QT += \ - core-private gui-private \ - platformheaders-private +QT += core-private gui-private qtConfig(opengl): QT += opengl-private |