From 74d7982b94dc0c5558faeef7edb48d49ba081490 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@qt.io>
Date: Wed, 5 Aug 2020 12:27:10 +0200
Subject: [PATCH] Update to match qtbase changes to platform headers

Change-Id: I8e39d87361728c81b526f1ad89b45136500c9913
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
---
 src/plugins/platforms/wayland/CMakeLists.txt  |  1 -
 src/plugins/platforms/wayland/client.pro      |  2 -
 .../wayland/qwaylandnativeinterface.cpp       | 40 -------------------
 .../wayland/qwaylandnativeinterface_p.h       |  6 ---
 4 files changed, 49 deletions(-)

diff --git a/src/plugins/platforms/wayland/CMakeLists.txt b/src/plugins/platforms/wayland/CMakeLists.txt
index b49a72920d4..88b27b5f3a9 100644
--- a/src/plugins/platforms/wayland/CMakeLists.txt
+++ b/src/plugins/platforms/wayland/CMakeLists.txt
@@ -56,7 +56,6 @@ qt_add_module(WaylandClient
     LIBRARIES
         Qt::CorePrivate
         Qt::GuiPrivate
-        Qt::PlatformHeadersPrivate
     PUBLIC_LIBRARIES
         Qt::Core
         Qt::Gui
diff --git a/src/plugins/platforms/wayland/client.pro b/src/plugins/platforms/wayland/client.pro
index 38b129e9edb..d6df946b58e 100644
--- a/src/plugins/platforms/wayland/client.pro
+++ b/src/plugins/platforms/wayland/client.pro
@@ -3,8 +3,6 @@ MODULE = waylandclient
 
 QT += core-private gui-private
 
-QT_PRIVATE += platformheaders-private
-
 # We have a bunch of C code with casts, so we can't have this option
 QMAKE_CXXFLAGS_WARN_ON -= -Wcast-qual
 
diff --git a/src/plugins/platforms/wayland/qwaylandnativeinterface.cpp b/src/plugins/platforms/wayland/qwaylandnativeinterface.cpp
index da788547789..2c9ba899fb9 100644
--- a/src/plugins/platforms/wayland/qwaylandnativeinterface.cpp
+++ b/src/plugins/platforms/wayland/qwaylandnativeinterface.cpp
@@ -55,8 +55,6 @@
 #include <QtWaylandClient/private/qwaylandvulkanwindow_p.h>
 #endif
 
-#include <QtPlatformHeaders/private/qwaylandwindowfunctions_p.h>
-
 QT_BEGIN_NAMESPACE
 
 namespace QtWaylandClient {
@@ -194,44 +192,6 @@ void QWaylandNativeInterface::emitWindowPropertyChanged(QPlatformWindow *window,
     emit windowPropertyChanged(window,name);
 }
 
-QFunctionPointer QWaylandNativeInterface::platformFunction(const QByteArray &resource) const
-{
-    if (resource == QWaylandWindowFunctions::setSyncIdentifier()) {
-        return QFunctionPointer(setSync);
-    } else if (resource == QWaylandWindowFunctions::setDeSyncIdentifier()) {
-        return QFunctionPointer(setDeSync);
-    } else if (resource == QWaylandWindowFunctions::isSyncIdentifier()) {
-        return QFunctionPointer(isSync);
-    }
-    return nullptr;
-}
-
-
-void QWaylandNativeInterface::setSync(QWindow *window)
-{
-    QWaylandWindow *ww = static_cast<QWaylandWindow*>(window->handle());
-    if (ww->subSurfaceWindow()) {
-        ww->subSurfaceWindow()->setSync();
-    }
-}
-
-void QWaylandNativeInterface::setDeSync(QWindow *window)
-{
-    QWaylandWindow *ww = static_cast<QWaylandWindow*>(window->handle());
-    if (ww->subSurfaceWindow()) {
-        ww->subSurfaceWindow()->setDeSync();
-    }
-}
-
-bool QWaylandNativeInterface::isSync(QWindow *window)
-{
-    QWaylandWindow *ww = static_cast<QWaylandWindow*>(window->handle());
-    if (ww->subSurfaceWindow()) {
-        return ww->subSurfaceWindow()->isSync();
-    }
-    return false;
-}
-
 }
 
 QT_END_NAMESPACE
diff --git a/src/plugins/platforms/wayland/qwaylandnativeinterface_p.h b/src/plugins/platforms/wayland/qwaylandnativeinterface_p.h
index 3de80eb6ac4..0edbdc9e697 100644
--- a/src/plugins/platforms/wayland/qwaylandnativeinterface_p.h
+++ b/src/plugins/platforms/wayland/qwaylandnativeinterface_p.h
@@ -82,15 +82,9 @@ public:
 
     void emitWindowPropertyChanged(QPlatformWindow *window, const QString &name);
 
-    QFunctionPointer platformFunction(const QByteArray &resource) const override;
-
 private:
     QWaylandIntegration *m_integration = nullptr;
     QHash<QPlatformWindow*, QVariantMap> m_windowProperties;
-
-    static void setSync(QWindow *window);
-    static void setDeSync(QWindow *window);
-    static bool isSync(QWindow *window);
 };
 
 }