summaryrefslogtreecommitdiffstats
path: root/src/widgets
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@qt.io>2020-07-03 15:40:47 +0200
committerTor Arne Vestbø <tor.arne.vestbo@qt.io>2020-07-06 11:52:14 +0200
commit8dd6957cd7a1d86714b32b97dffe603a8636848a (patch)
tree7793275d713c3341e01bb8dafc3d1ec9af2f58db /src/widgets
parent18cfabafa615e42c4af092edca5bb35eced4de5e (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/widgets')
-rw-r--r--src/widgets/.prev_CMakeLists.txt1
-rw-r--r--src/widgets/CMakeLists.txt1
-rw-r--r--src/widgets/kernel/kernel.pri2
-rw-r--r--src/widgets/kernel/qwidget.cpp2
4 files changed, 5 insertions, 1 deletions
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>