From 8dd6957cd7a1d86714b32b97dffe603a8636848a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@qt.io>
Date: Fri, 3 Jul 2020 15:40:47 +0200
Subject: Make QtPlatformHeaders a private module
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

(limited to 'src/plugins/platforms/windows')

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
 
-- 
cgit v1.2.3