Remove platformheaders

Move it to qtbase. QtPlatformHeaders would otherwise conflict.

Change-Id: I9fdabc64fb59f6190ca8c12e22f09912ef6a2fe1
Reviewed-by: Giulio Camuffo <giuliocamuffo@gmail.com>

4 files changed, 0 insertions, 99 deletions

diff --git a/src/platformheaders/platformheaders.pro b/src/platformheaders/platformheaders.pro
deleted file mode 100644
index 1d64b354..00000000
--- a/src/platformheaders/platformheaders.pro
+++ /dev/null
@@ -1,10 +0,0 @@
-TEMPLATE = subdirs
-VERSION = $$MODULE_VERSION
-MODULE_INCNAME = QtPlatformHeaders
-
-include(waylandfunctions/waylandfunctions.pri)
-
-load(qt_module_headers)
-#load(qt_docs)
-load(qt_installs)
-
diff --git a/src/platformheaders/waylandfunctions/qwaylandwindowfunctions.h b/src/platformheaders/waylandfunctions/qwaylandwindowfunctions.h
deleted file mode 100644
index 9c2e5f2a..00000000
--- a/src/platformheaders/waylandfunctions/qwaylandwindowfunctions.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 LG Electronics Ltd, author: mikko.levonmaa@lge.com
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QWAYLANDWINDOWFUNCTIONS_H
-#define QWAYLANDWINDOWFUNCTIONS_H
-
-#include <QtCore/QByteArray>
-#include <QtGui/QGuiApplication>
-
-QT_BEGIN_NAMESPACE
-
-class QWindow;
-
-class QWaylandWindowFunctions {
-public:
-
-    typedef void (*SetWindowSync)(QWindow *window);
-    typedef void (*SetWindowDeSync)(QWindow *window);
-    typedef bool (*IsWindowSync)(QWindow *window);
-    static const QByteArray setSyncIdentifier() { return QByteArrayLiteral("WaylandSubSurfaceSetSync"); }
-    static const QByteArray setDeSyncIdentifier() { return QByteArrayLiteral("WaylandSubSurfaceSetDeSync"); }
-    static const QByteArray isSyncIdentifier() { return QByteArrayLiteral("WaylandSubSurfaceIsSync"); }
-
-    static void setSync(QWindow *window)
-    {
-        static SetWindowSync func = reinterpret_cast<SetWindowSync>(QGuiApplication::platformFunction(setSyncIdentifier()));
-        Q_ASSERT(func);
-        func(window);
-    }
-
-    static void setDeSync(QWindow *window)
-    {
-        static SetWindowDeSync func = reinterpret_cast<SetWindowDeSync>(QGuiApplication::platformFunction(setDeSyncIdentifier()));
-        Q_ASSERT(func);
-        func(window);
-    }
-
-    static bool isSync(QWindow *window)
-    {
-        static IsWindowSync func = reinterpret_cast<IsWindowSync>(QGuiApplication::platformFunction(isSyncIdentifier()));
-        Q_ASSERT(func);
-        return func(window);
-    }
-
-};
-
-QT_END_NAMESPACE
-
-#endif // QWAYLANDWINDOWFUNCTIONS_H
-
diff --git a/src/platformheaders/waylandfunctions/waylandfunctions.pri b/src/platformheaders/waylandfunctions/waylandfunctions.pri
deleted file mode 100644
index 202df907..00000000
--- a/src/platformheaders/waylandfunctions/waylandfunctions.pri
+++ /dev/null
@@ -1 +0,0 @@
-HEADERS += $$PWD/qwaylandwindowfunctions.h
diff --git a/src/src.pro b/src/src.pro
index f9cf9172..bf5ffe36 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -23,5 +23,3 @@ sub_plugins.subdir = plugins
 sub_plugins.depends = sub-qtwaylandscanner sub-client sub-compositor
 sub_plugins.target = sub-plugins
 SUBDIRS += sub_plugins
-
-SUBDIRS += platformheaders