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/windows | |
| 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/windows')
| -rw-r--r-- | src/plugins/platforms/windows/.prev_CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/plugins/platforms/windows/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/plugins/platforms/windows/qwindowsnativeinterface.h | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/windows/qwindowswindow.h | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/windows/windows.pro | 2 |
5 files changed, 5 insertions, 3 deletions
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 |