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/plugins/platforms/xcb | |
| 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/plugins/platforms/xcb')
| -rw-r--r-- | src/plugins/platforms/xcb/.prev_CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/xcb/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbnativeinterface.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbwindow.h | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/xcb/xcb-plugin.pro | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/xcb/xcb_qpa_lib.pro | 3 |
6 files changed, 10 insertions, 5 deletions
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 |