diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-07-03 15:40:47 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-07-06 11:52:14 +0200 |
| commit | 8dd6957cd7a1d86714b32b97dffe603a8636848a (patch) | |
| tree | 7793275d713c3341e01bb8dafc3d1ec9af2f58db /src | |
| parent | 18cfabafa615e42c4af092edca5bb35eced4de5e (diff) | |
Make QtPlatformHeaders a private module
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>
Diffstat (limited to 'src')
50 files changed, 184 insertions, 42 deletions
diff --git a/src/platformheaders/.prev_CMakeLists.txt b/src/platformheaders/.prev_CMakeLists.txt index 5456de5c80..d752381fb7 100644 --- a/src/platformheaders/.prev_CMakeLists.txt +++ b/src/platformheaders/.prev_CMakeLists.txt @@ -1,2 +1,25 @@ # Generated from platformheaders.pro. +##################################################################### +## PlatformHeaders Module: +##################################################################### + +qt_add_module(PlatformHeaders + HEADER_MODULE + SOURCES + cocoafunctions/qcocoawindowfunctions_p.h + eglfsfunctions/qeglfsfunctions_p.h + helper/qplatformheaderhelper_p.h + linuxfbfunctions/qlinuxfbfunctions_p.h + waylandfunctions/qwaylandwindowfunctions_p.h + windowsfunctions/qwindowswindowfunctions_p.h + xcbfunctions/qxcbscreenfunctions_p.h + xcbfunctions/qxcbwindowfunctions_p.h + PUBLIC_LIBRARIES + Qt::Core + Qt::Gui +) +qt_add_docs(PlatformHeaders + doc/qtplatformheaders.qdocconf +) + diff --git a/src/platformheaders/CMakeLists.txt b/src/platformheaders/CMakeLists.txt index 820bbb71a5..63bb60576f 100644 --- a/src/platformheaders/CMakeLists.txt +++ b/src/platformheaders/CMakeLists.txt @@ -1,13 +1,27 @@ # Generated from platformheaders.pro. -# special case begin - -# FIXME Add the rest of the stuff? I don't think any other stuff is needed? - -qt_add_module(PlatformHeaders HEADER_MODULE) +##################################################################### +## PlatformHeaders Module: +##################################################################### +qt_add_module(PlatformHeaders + HEADER_MODULE + # special case begin + # SOURCES + # cocoafunctions/qcocoawindowfunctions_p.h + # eglfsfunctions/qeglfsfunctions_p.h + # helper/qplatformheaderhelper_p.h + # linuxfbfunctions/qlinuxfbfunctions_p.h + # waylandfunctions/qwaylandwindowfunctions_p.h + # windowsfunctions/qwindowswindowfunctions_p.h + # xcbfunctions/qxcbscreenfunctions_p.h + # xcbfunctions/qxcbwindowfunctions_p.h + # special case end + PUBLIC_LIBRARIES + Qt::Core + Qt::Gui +) qt_add_docs(PlatformHeaders doc/qtplatformheaders.qdocconf ) -# special case end diff --git a/src/platformheaders/cocoafunctions/cocoafunctions.pri b/src/platformheaders/cocoafunctions/cocoafunctions.pri index 3987523f9a..640d29c8ce 100644 --- a/src/platformheaders/cocoafunctions/cocoafunctions.pri +++ b/src/platformheaders/cocoafunctions/cocoafunctions.pri @@ -1 +1 @@ -HEADERS += $$PWD/qcocoawindowfunctions.h +HEADERS += $$PWD/qcocoawindowfunctions_p.h diff --git a/src/platformheaders/cocoafunctions/qcocoawindowfunctions.h b/src/platformheaders/cocoafunctions/qcocoawindowfunctions_p.h index 248900ad2a..7701509a66 100644 --- a/src/platformheaders/cocoafunctions/qcocoawindowfunctions.h +++ b/src/platformheaders/cocoafunctions/qcocoawindowfunctions_p.h @@ -40,7 +40,18 @@ #ifndef QCOCOAWINDOWFUNCTIONS_H #define QCOCOAWINDOWFUNCTIONS_H -#include <QtPlatformHeaders/QPlatformHeaderHelper> +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include <QtPlatformHeaders/private/qplatformheaderhelper_p.h> QT_BEGIN_NAMESPACE diff --git a/src/platformheaders/doc/snippets/qwindowswindowfunctions/main.cpp b/src/platformheaders/doc/snippets/qwindowswindowfunctions/main.cpp index f8f4f28ed3..53b9a58867 100644 --- a/src/platformheaders/doc/snippets/qwindowswindowfunctions/main.cpp +++ b/src/platformheaders/doc/snippets/qwindowswindowfunctions/main.cpp @@ -49,7 +49,7 @@ ****************************************************************************/ #include <QtWidgets> -#include <QtPlatformHeaders/qwindowswindowfunctions.h> +#include <QtPlatformHeaders/private/qwindowswindowfunctions_p.h> //! [0] int main(int argc, char **argv) diff --git a/src/platformheaders/doc/snippets/qxcbwindowfunctions/main.cpp b/src/platformheaders/doc/snippets/qxcbwindowfunctions/main.cpp index c2b66e6aa2..3299292993 100644 --- a/src/platformheaders/doc/snippets/qxcbwindowfunctions/main.cpp +++ b/src/platformheaders/doc/snippets/qxcbwindowfunctions/main.cpp @@ -49,7 +49,7 @@ ****************************************************************************/ #include <QtWidgets> -#include <QtPlatformHeaders/qxcbwindowfunctions.h> +#include <QtPlatformHeaders/private/qxcbwindowfunctions_p.h> //! [0] int main(int argc, char **argv) diff --git a/src/platformheaders/eglfsfunctions/eglfsfunctions.pri b/src/platformheaders/eglfsfunctions/eglfsfunctions.pri index e4e645f5a5..76c6383ddb 100644 --- a/src/platformheaders/eglfsfunctions/eglfsfunctions.pri +++ b/src/platformheaders/eglfsfunctions/eglfsfunctions.pri @@ -1 +1 @@ -HEADERS += $$PWD/qeglfsfunctions.h +HEADERS += $$PWD/qeglfsfunctions_p.h diff --git a/src/platformheaders/eglfsfunctions/qeglfsfunctions.h b/src/platformheaders/eglfsfunctions/qeglfsfunctions_p.h index 869fe7ce3f..1eb177f694 100644 --- a/src/platformheaders/eglfsfunctions/qeglfsfunctions.h +++ b/src/platformheaders/eglfsfunctions/qeglfsfunctions_p.h @@ -40,6 +40,17 @@ #ifndef QEGLFSFUNCTIONS_H #define QEGLFSFUNCTIONS_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include <QtCore/QByteArray> #include <QtGui/QGuiApplication> diff --git a/src/platformheaders/helper/helper.pri b/src/platformheaders/helper/helper.pri index 2f6e766214..10914f9e5e 100644 --- a/src/platformheaders/helper/helper.pri +++ b/src/platformheaders/helper/helper.pri @@ -1,2 +1,2 @@ HEADERS += \ - $$PWD/qplatformheaderhelper.h + $$PWD/qplatformheaderhelper_p.h diff --git a/src/platformheaders/helper/qplatformheaderhelper.h b/src/platformheaders/helper/qplatformheaderhelper_p.h index 6959d889ae..54567667f6 100644 --- a/src/platformheaders/helper/qplatformheaderhelper.h +++ b/src/platformheaders/helper/qplatformheaderhelper_p.h @@ -40,6 +40,17 @@ #ifndef QPLATFORMHEADERHELPER_H #define QPLATFORMHEADERHELPER_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include <QtCore/QByteArray> #include <QtGui/QGuiApplication> diff --git a/src/platformheaders/linuxfbfunctions/linuxfbfunctions.pri b/src/platformheaders/linuxfbfunctions/linuxfbfunctions.pri index 8a092c3049..dd18d6c0bb 100644 --- a/src/platformheaders/linuxfbfunctions/linuxfbfunctions.pri +++ b/src/platformheaders/linuxfbfunctions/linuxfbfunctions.pri @@ -1 +1 @@ -HEADERS += $$PWD/qlinuxfbfunctions.h +HEADERS += $$PWD/qlinuxfbfunctions_p.h diff --git a/src/platformheaders/linuxfbfunctions/qlinuxfbfunctions.h b/src/platformheaders/linuxfbfunctions/qlinuxfbfunctions_p.h index 94c4c24270..74e5187282 100644 --- a/src/platformheaders/linuxfbfunctions/qlinuxfbfunctions.h +++ b/src/platformheaders/linuxfbfunctions/qlinuxfbfunctions_p.h @@ -40,6 +40,17 @@ #ifndef QLINUXFBFUNCTIONS_H #define QLINUXFBFUNCTIONS_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include <QtCore/QByteArray> #include <QtGui/QGuiApplication> diff --git a/src/platformheaders/platformheaders.pro b/src/platformheaders/platformheaders.pro index 22d1655c77..867f71a4bb 100644 --- a/src/platformheaders/platformheaders.pro +++ b/src/platformheaders/platformheaders.pro @@ -1,7 +1,5 @@ -# Only headers here, no library is wanted. -TEMPLATE = subdirs -VERSION = $$MODULE_VERSION -MODULE_INCNAME = QtPlatformHeaders +TARGET = QtPlatformHeaders +CONFIG += header_module include(xcbfunctions/xcbfunctions.pri) include(eglfsfunctions/eglfsfunctions.pri) @@ -13,6 +11,4 @@ include(linuxfbfunctions/linuxfbfunctions.pri) QMAKE_DOCS = $$PWD/doc/qtplatformheaders.qdocconf -load(qt_module_headers) -load(qt_docs) -load(qt_installs) +load(qt_module) diff --git a/src/platformheaders/waylandfunctions/qwaylandwindowfunctions.h b/src/platformheaders/waylandfunctions/qwaylandwindowfunctions_p.h index 9c2e5f2a14..6d4060daa1 100644 --- a/src/platformheaders/waylandfunctions/qwaylandwindowfunctions.h +++ b/src/platformheaders/waylandfunctions/qwaylandwindowfunctions_p.h @@ -40,6 +40,17 @@ #ifndef QWAYLANDWINDOWFUNCTIONS_H #define QWAYLANDWINDOWFUNCTIONS_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include <QtCore/QByteArray> #include <QtGui/QGuiApplication> diff --git a/src/platformheaders/waylandfunctions/waylandfunctions.pri b/src/platformheaders/waylandfunctions/waylandfunctions.pri index 202df907e5..ec612d6418 100644 --- a/src/platformheaders/waylandfunctions/waylandfunctions.pri +++ b/src/platformheaders/waylandfunctions/waylandfunctions.pri @@ -1 +1 @@ -HEADERS += $$PWD/qwaylandwindowfunctions.h +HEADERS += $$PWD/qwaylandwindowfunctions_p.h diff --git a/src/platformheaders/windowsfunctions/qwindowswindowfunctions.h b/src/platformheaders/windowsfunctions/qwindowswindowfunctions_p.h index 722f640a13..5e8881fc87 100644 --- a/src/platformheaders/windowsfunctions/qwindowswindowfunctions.h +++ b/src/platformheaders/windowsfunctions/qwindowswindowfunctions_p.h @@ -40,6 +40,17 @@ #ifndef QWINDOWSWINDOWFUNCTIONS_H #define QWINDOWSWINDOWFUNCTIONS_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include <QtCore/QByteArray> #include <QtGui/QGuiApplication> diff --git a/src/platformheaders/windowsfunctions/windowsfunctions.pri b/src/platformheaders/windowsfunctions/windowsfunctions.pri index 479245db80..ee11b9c2b0 100644 --- a/src/platformheaders/windowsfunctions/windowsfunctions.pri +++ b/src/platformheaders/windowsfunctions/windowsfunctions.pri @@ -1 +1 @@ -HEADERS += $$PWD/qwindowswindowfunctions.h +HEADERS += $$PWD/qwindowswindowfunctions_p.h diff --git a/src/platformheaders/xcbfunctions/qxcbscreenfunctions.h b/src/platformheaders/xcbfunctions/qxcbscreenfunctions_p.h index 99624bd5d6..f040701941 100644 --- a/src/platformheaders/xcbfunctions/qxcbscreenfunctions.h +++ b/src/platformheaders/xcbfunctions/qxcbscreenfunctions_p.h @@ -40,7 +40,18 @@ #ifndef QXCBSCREENFUNCTIONS_H #define QXCBSCREENFUNCTIONS_H -#include <QtPlatformHeaders/QPlatformHeaderHelper> +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include <QtPlatformHeaders/private/qplatformheaderhelper_p.h> QT_BEGIN_NAMESPACE diff --git a/src/platformheaders/xcbfunctions/qxcbwindowfunctions.h b/src/platformheaders/xcbfunctions/qxcbwindowfunctions_p.h index b0e6cb6a1d..26b0798fc8 100644 --- a/src/platformheaders/xcbfunctions/qxcbwindowfunctions.h +++ b/src/platformheaders/xcbfunctions/qxcbwindowfunctions_p.h @@ -40,7 +40,18 @@ #ifndef QXCBWINDOWFUNCTIONS_H #define QXCBWINDOWFUNCTIONS_H -#include <QtPlatformHeaders/QPlatformHeaderHelper> +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include <QtPlatformHeaders/private/qplatformheaderhelper_p.h> QT_BEGIN_NAMESPACE diff --git a/src/platformheaders/xcbfunctions/xcbfunctions.pri b/src/platformheaders/xcbfunctions/xcbfunctions.pri index 3fbee53854..5ca2721506 100644 --- a/src/platformheaders/xcbfunctions/xcbfunctions.pri +++ b/src/platformheaders/xcbfunctions/xcbfunctions.pri @@ -1,3 +1,3 @@ HEADERS += \ - $$PWD/qxcbwindowfunctions.h \ - $$PWD/qxcbscreenfunctions.h + $$PWD/qxcbwindowfunctions_p.h \ + $$PWD/qxcbscreenfunctions_p.h diff --git a/src/plugins/platforms/cocoa/.prev_CMakeLists.txt b/src/plugins/platforms/cocoa/.prev_CMakeLists.txt index ee40e32033..0d2ed167b6 100644 --- a/src/plugins/platforms/cocoa/.prev_CMakeLists.txt +++ b/src/plugins/platforms/cocoa/.prev_CMakeLists.txt @@ -58,6 +58,7 @@ 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 51d7038950..8180787737 100644 --- a/src/plugins/platforms/cocoa/CMakeLists.txt +++ b/src/plugins/platforms/cocoa/CMakeLists.txt @@ -64,6 +64,7 @@ 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 742038d5cd..e5a45612b8 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 +QT += core-private gui-private platformheaders-private CONFIG += no_app_extension_api_only diff --git a/src/plugins/platforms/cocoa/qcocoanativeinterface.mm b/src/plugins/platforms/cocoa/qcocoanativeinterface.mm index 22bab0886d..426e413a86 100644 --- a/src/plugins/platforms/cocoa/qcocoanativeinterface.mm +++ b/src/plugins/platforms/cocoa/qcocoanativeinterface.mm @@ -64,7 +64,7 @@ #include <QtGui/private/qcoregraphics_p.h> -#include <QtPlatformHeaders/qcocoawindowfunctions.h> +#include <QtPlatformHeaders/private/qcocoawindowfunctions_p.h> #if QT_CONFIG(vulkan) #include <MoltenVK/mvk_vulkan.h> diff --git a/src/plugins/platforms/direct2d/direct2d.pro b/src/plugins/platforms/direct2d/direct2d.pro index 70e4ef497e..9a8caac700 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 + core-private gui-private platformheaders-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 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 diff --git a/src/plugins/platforms/linuxfb/.prev_CMakeLists.txt b/src/plugins/platforms/linuxfb/.prev_CMakeLists.txt index 258b70603e..f3e5c13e6d 100644 --- a/src/plugins/platforms/linuxfb/.prev_CMakeLists.txt +++ b/src/plugins/platforms/linuxfb/.prev_CMakeLists.txt @@ -19,6 +19,7 @@ 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 ea5642f1c0..b89354cdfd 100644 --- a/src/plugins/platforms/linuxfb/CMakeLists.txt +++ b/src/plugins/platforms/linuxfb/CMakeLists.txt @@ -20,6 +20,7 @@ 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 08a4d6dd0c..df2831a0cd 100644 --- a/src/plugins/platforms/linuxfb/linuxfb.pro +++ b/src/plugins/platforms/linuxfb/linuxfb.pro @@ -4,6 +4,7 @@ DEFINES += QT_NO_FOREACH QT += \ core-private gui-private \ + platformheaders-private \ fb_support-private qtHaveModule(input_support-private): \ diff --git a/src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp b/src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp index 68c68ab8f6..498beec229 100644 --- a/src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp +++ b/src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp @@ -70,7 +70,7 @@ #include <QtInputSupport/private/qtslib_p.h> #endif -#include <QtPlatformHeaders/qlinuxfbfunctions.h> +#include <QtPlatformHeaders/private/qlinuxfbfunctions_p.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/windows/.prev_CMakeLists.txt b/src/plugins/platforms/windows/.prev_CMakeLists.txt index 7252a1d065..ada50698cd 100644 --- a/src/plugins/platforms/windows/.prev_CMakeLists.txt +++ b/src/plugins/platforms/windows/.prev_CMakeLists.txt @@ -52,6 +52,7 @@ 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 9064b2f740..f0aa2a1980 100644 --- a/src/plugins/platforms/windows/CMakeLists.txt +++ b/src/plugins/platforms/windows/CMakeLists.txt @@ -53,6 +53,7 @@ qt_internal_add_plugin(QWindowsIntegrationPlugin Qt::CorePrivate Qt::Gui Qt::GuiPrivate + Qt::PlatformHeadersPrivate dwmapi imm32 oleaut32 diff --git a/src/plugins/platforms/windows/qwindowsnativeinterface.h b/src/plugins/platforms/windows/qwindowsnativeinterface.h index 387f65ae8f..393e1f1c99 100644 --- a/src/plugins/platforms/windows/qwindowsnativeinterface.h +++ b/src/plugins/platforms/windows/qwindowsnativeinterface.h @@ -42,7 +42,7 @@ #include <QtGui/qfont.h> #include <QtGui/qpa/qplatformnativeinterface.h> -#include <QtPlatformHeaders/qwindowswindowfunctions.h> +#include <QtPlatformHeaders/private/qwindowswindowfunctions_p.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/windows/qwindowswindow.h b/src/plugins/platforms/windows/qwindowswindow.h index cd6179bf03..8d47b5b4f3 100644 --- a/src/plugins/platforms/windows/qwindowswindow.h +++ b/src/plugins/platforms/windows/qwindowswindow.h @@ -45,7 +45,7 @@ #include "qwindowscursor.h" #include <qpa/qplatformwindow.h> -#include <QtPlatformHeaders/qwindowswindowfunctions.h> +#include <QtPlatformHeaders/private/qwindowswindowfunctions_p.h> #if QT_CONFIG(vulkan) #include "qwindowsvulkaninstance.h" diff --git a/src/plugins/platforms/windows/windows.pro b/src/plugins/platforms/windows/windows.pro index 577bbd775b..283b332ee9 100644 --- a/src/plugins/platforms/windows/windows.pro +++ b/src/plugins/platforms/windows/windows.pro @@ -1,7 +1,7 @@ TARGET = qwindows QT += \ - core-private gui-private + core-private gui-private platformheaders-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 0cf401037e..4ca2f75725 100644 --- a/src/plugins/platforms/xcb/.prev_CMakeLists.txt +++ b/src/plugins/platforms/xcb/.prev_CMakeLists.txt @@ -42,6 +42,7 @@ qt_add_module(XcbQpa PkgConfig::XKB_COMMON_X11 Qt::CorePrivate Qt::GuiPrivate + Qt::PlatformHeadersPrivate XCB::ICCCM XCB::IMAGE XCB::KEYSYMS @@ -141,6 +142,7 @@ 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 22a955fec6..9604e627cc 100644 --- a/src/plugins/platforms/xcb/CMakeLists.txt +++ b/src/plugins/platforms/xcb/CMakeLists.txt @@ -42,6 +42,7 @@ qt_add_module(XcbQpa PkgConfig::XKB_COMMON_X11 Qt::CorePrivate Qt::GuiPrivate + Qt::PlatformHeadersPrivate XCB::ICCCM XCB::IMAGE XCB::KEYSYMS @@ -168,6 +169,7 @@ qt_internal_add_plugin(QXcbIntegrationPlugin PUBLIC_LIBRARIES Qt::CorePrivate Qt::GuiPrivate + Qt::PlatformHeadersPrivate Qt::XcbQpaPrivate ) diff --git a/src/plugins/platforms/xcb/qxcbnativeinterface.cpp b/src/plugins/platforms/xcb/qxcbnativeinterface.cpp index fba62c57b5..52b4ffa7a9 100644 --- a/src/plugins/platforms/xcb/qxcbnativeinterface.cpp +++ b/src/plugins/platforms/xcb/qxcbnativeinterface.cpp @@ -53,8 +53,8 @@ #include <QtGui/qopenglcontext.h> #include <QtGui/qscreen.h> -#include <QtPlatformHeaders/qxcbwindowfunctions.h> -#include <QtPlatformHeaders/qxcbscreenfunctions.h> +#include <QtPlatformHeaders/private/qxcbwindowfunctions_p.h> +#include <QtPlatformHeaders/private/qxcbscreenfunctions_p.h> #include <stdio.h> diff --git a/src/plugins/platforms/xcb/qxcbwindow.h b/src/plugins/platforms/xcb/qxcbwindow.h index 0cdc40f82d..a5803939fb 100644 --- a/src/plugins/platforms/xcb/qxcbwindow.h +++ b/src/plugins/platforms/xcb/qxcbwindow.h @@ -49,7 +49,7 @@ #include "qxcbobject.h" -#include <QtPlatformHeaders/qxcbwindowfunctions.h> +#include <QtPlatformHeaders/private/qxcbwindowfunctions_p.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/xcb/xcb-plugin.pro b/src/plugins/platforms/xcb/xcb-plugin.pro index 4c646d42c6..90c26c2188 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 +QT += core-private gui-private xcb_qpa_lib-private platformheaders-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 a146b62e17..c77439220e 100644 --- a/src/plugins/platforms/xcb/xcb_qpa_lib.pro +++ b/src/plugins/platforms/xcb/xcb_qpa_lib.pro @@ -3,7 +3,8 @@ CONFIG += no_module_headers internal_module DEFINES += QT_NO_FOREACH QT += \ - core-private gui-private + core-private gui-private \ + platformheaders-private qtConfig(opengl): QT += opengl-private diff --git a/src/widgets/.prev_CMakeLists.txt b/src/widgets/.prev_CMakeLists.txt index 971791c363..9dab8ff046 100644 --- a/src/widgets/.prev_CMakeLists.txt +++ b/src/widgets/.prev_CMakeLists.txt @@ -57,6 +57,7 @@ qt_add_module(Widgets LIBRARIES Qt::CorePrivate Qt::GuiPrivate + Qt::PlatformHeadersPrivate PUBLIC_LIBRARIES Qt::Core Qt::Gui diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt index 84ed6f7fa9..0909a445aa 100644 --- a/src/widgets/CMakeLists.txt +++ b/src/widgets/CMakeLists.txt @@ -57,6 +57,7 @@ qt_add_module(Widgets LIBRARIES Qt::CorePrivate Qt::GuiPrivate + Qt::PlatformHeadersPrivate PUBLIC_LIBRARIES Qt::Core Qt::Gui diff --git a/src/widgets/kernel/kernel.pri b/src/widgets/kernel/kernel.pri index 462897b886..c3860f0589 100644 --- a/src/widgets/kernel/kernel.pri +++ b/src/widgets/kernel/kernel.pri @@ -3,6 +3,8 @@ # Only used on platforms with CONFIG += precompile_header PRECOMPILED_HEADER = kernel/qt_widgets_pch.h +QT_PRIVATE += platformheaders-private + KERNEL_P= kernel HEADERS += \ kernel/qtwidgetsglobal.h \ diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp index b7396f2b6b..5a75900f84 100644 --- a/src/widgets/kernel/qwidget.cpp +++ b/src/widgets/kernel/qwidget.cpp @@ -113,7 +113,7 @@ #include "qwindowcontainer_p.h" -#include <QtPlatformHeaders/qxcbwindowfunctions.h> +#include <QtPlatformHeaders/private/qxcbwindowfunctions_p.h> #include <private/qmemory_p.h> |