From b61ab2b425627be68ee04e11016fafd07f0617c3 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Fri, 17 Jul 2020 13:10:41 +0200
Subject: Add QPlatformInterface::Private::QWindowsWindow
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Remove QWindowsWindowFunctions

Task-number: QTBUG-83252
Change-Id: Iacfdf2e0f430208901c182e461c4617e1ef526ce
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
---
 src/plugins/platforms/windows/qwindowswindow.h | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'src/plugins/platforms/windows/qwindowswindow.h')

diff --git a/src/plugins/platforms/windows/qwindowswindow.h b/src/plugins/platforms/windows/qwindowswindow.h
index 27c225f626..6c6c86ef47 100644
--- a/src/plugins/platforms/windows/qwindowswindow.h
+++ b/src/plugins/platforms/windows/qwindowswindow.h
@@ -46,7 +46,7 @@
 #include "qwindowscursor.h"
 
 #include <qpa/qplatformwindow.h>
-#include <QtPlatformHeaders/private/qwindowswindowfunctions_p.h>
+#include <qpa/qplatformwindow_p.h>
 
 #if QT_CONFIG(vulkan)
 #include "qwindowsvulkaninstance.h"
@@ -124,7 +124,8 @@ struct QWindowsWindowData
                                      const QString &title);
 };
 
-class QWindowsBaseWindow : public QPlatformWindow
+class QWindowsBaseWindow : public QPlatformWindow,
+                           public QPlatformInterface::Private::QWindowsWindow
 {
     Q_DISABLE_COPY_MOVE(QWindowsBaseWindow)
 public:
@@ -140,6 +141,9 @@ public:
     QPoint mapFromGlobal(const QPoint &pos) const override;
     virtual QMargins fullFrameMargins() const { return frameMargins_sys(); }
 
+    void setHasBorderInFullScreen(bool border) override;
+    bool hasBorderInFullScreen() const override;
+
     using QPlatformWindow::screenForGeometry;
 
     virtual HWND handle() const = 0;
@@ -358,7 +362,8 @@ public:
     void registerTouchWindow();
     static void setHasBorderInFullScreenStatic(QWindow *window, bool border);
     static void setHasBorderInFullScreenDefault(bool border);
-    void setHasBorderInFullScreen(bool border);
+    void setHasBorderInFullScreen(bool border) override;
+    bool hasBorderInFullScreen() const override;
     static QString formatWindowTitle(const QString &title);
 
     static const char *embeddedNativeParentHandleProperty;
-- 
cgit v1.2.3