From 4595fb2c1edce6d2f5e7616111702018d3778001 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Wed, 29 Jul 2020 15:31:06 +0200 Subject: Remove QWaylandWindowFunctions The subsurface sync/desync functions were unimplemented on the qtwayland side, so this is all dead code. We will introduce the platform interfaces if an actual use-case with an implementation comes up. Task-number: QTBUG-84220 Change-Id: I921ee7262e5f0a7171058aaf0ff2102d9e6f438e Reviewed-by: Paul Olav Tvete --- src/platformheaders/platformheaders.pro | 1 - .../waylandfunctions/qwaylandwindowfunctions_p.h | 97 ---------------------- .../waylandfunctions/waylandfunctions.pri | 1 - 3 files changed, 99 deletions(-) delete mode 100644 src/platformheaders/waylandfunctions/qwaylandwindowfunctions_p.h delete mode 100644 src/platformheaders/waylandfunctions/waylandfunctions.pri (limited to 'src/platformheaders') diff --git a/src/platformheaders/platformheaders.pro b/src/platformheaders/platformheaders.pro index 63d162e2b2..da31567c97 100644 --- a/src/platformheaders/platformheaders.pro +++ b/src/platformheaders/platformheaders.pro @@ -3,7 +3,6 @@ CONFIG += header_module include(eglfsfunctions/eglfsfunctions.pri) include(helper/helper.pri) -include(waylandfunctions/waylandfunctions.pri) QMAKE_DOCS = $$PWD/doc/qtplatformheaders.qdocconf diff --git a/src/platformheaders/waylandfunctions/qwaylandwindowfunctions_p.h b/src/platformheaders/waylandfunctions/qwaylandwindowfunctions_p.h deleted file mode 100644 index 6d4060daa1..0000000000 --- a/src/platformheaders/waylandfunctions/qwaylandwindowfunctions_p.h +++ /dev/null @@ -1,97 +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 - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#include -#include - -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(QGuiApplication::platformFunction(setSyncIdentifier())); - Q_ASSERT(func); - func(window); - } - - static void setDeSync(QWindow *window) - { - static SetWindowDeSync func = reinterpret_cast(QGuiApplication::platformFunction(setDeSyncIdentifier())); - Q_ASSERT(func); - func(window); - } - - static bool isSync(QWindow *window) - { - static IsWindowSync func = reinterpret_cast(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 ec612d6418..0000000000 --- a/src/platformheaders/waylandfunctions/waylandfunctions.pri +++ /dev/null @@ -1 +0,0 @@ -HEADERS += $$PWD/qwaylandwindowfunctions_p.h -- cgit v1.2.3