diff options
Diffstat (limited to 'src/plugins/platforms')
21 files changed, 108 insertions, 569 deletions
diff --git a/src/plugins/platforms/CMakeLists.txt b/src/plugins/platforms/CMakeLists.txt new file mode 100644 index 000000000..b26c5f2ca --- /dev/null +++ b/src/plugins/platforms/CMakeLists.txt @@ -0,0 +1,12 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + +# Generated from platforms.pro. + +add_subdirectory(qwayland-generic) +if(QT_FEATURE_wayland_egl) + add_subdirectory(qwayland-egl) +endif() +if(QT_FEATURE_wayland_brcm) + add_subdirectory(qwayland-brcm-egl) +endif() diff --git a/src/plugins/platforms/platforms.pro b/src/plugins/platforms/platforms.pro deleted file mode 100644 index ec589ae83..000000000 --- a/src/plugins/platforms/platforms.pro +++ /dev/null @@ -1,17 +0,0 @@ -TEMPLATE=subdirs -CONFIG+=ordered -QT_FOR_CONFIG += waylandclient-private - -SUBDIRS += qwayland-generic - -qtConfig(wayland-egl): \ - SUBDIRS += qwayland-egl - -#The following integrations are only useful with QtWaylandCompositor -qtConfig(wayland-brcm): \ - SUBDIRS += qwayland-brcm-egl - -qtConfig(xcomposite-egl): \ - SUBDIRS += qwayland-xcomposite-egl -qtConfig(xcomposite-glx): \ - SUBDIRS += qwayland-xcomposite-glx diff --git a/src/plugins/platforms/qwayland-brcm-egl/CMakeLists.txt b/src/plugins/platforms/qwayland-brcm-egl/CMakeLists.txt new file mode 100644 index 000000000..944ec5ded --- /dev/null +++ b/src/plugins/platforms/qwayland-brcm-egl/CMakeLists.txt @@ -0,0 +1,35 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + +# Generated from qwayland-brcm-egl.pro. + +##################################################################### +## QWaylandBrcmEglPlatformIntegrationPlugin Plugin: +##################################################################### + +qt_internal_add_plugin(QWaylandBrcmEglPlatformIntegrationPlugin + OUTPUT_NAME qwayland-brcm-egl + PLUGIN_TYPE platforms + SOURCES + ../../../hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.cpp ../../../hardwareintegration/client/brcm-egl/qwaylandbrcmeglintegration.h + ../../../hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.cpp ../../../hardwareintegration/client/brcm-egl/qwaylandbrcmeglwindow.h + ../../../hardwareintegration/client/brcm-egl/qwaylandbrcmglcontext.cpp ../../../hardwareintegration/client/brcm-egl/qwaylandbrcmglcontext.h + main.cpp + INCLUDE_DIRECTORIES + ../../../hardwareintegration/client/brcm-egl + PUBLIC_LIBRARIES + ${CMAKE_DL_LIBS} + EGL::EGL + Qt::Core + Qt::Gui + Qt::WaylandClientPrivate + Wayland::Client +) + +qt6_generate_wayland_protocol_client_sources(QWaylandBrcmEglPlatformIntegrationPlugin + FILES + ${CMAKE_CURRENT_SOURCE_DIR}/../../../hardwareintegration/client/brcm-egl/../../../extensions/brcm.xml +) + +#### Keys ignored in scope 1:.:.:qwayland-brcm-egl.pro:<TRUE>: +# OTHER_FILES = "qwayland-brcm-egl.json" diff --git a/src/plugins/platforms/qwayland-brcm-egl/main.cpp b/src/plugins/platforms/qwayland-brcm-egl/main.cpp index 5fa40b8a7..4a13465c7 100644 --- a/src/plugins/platforms/qwayland-brcm-egl/main.cpp +++ b/src/plugins/platforms/qwayland-brcm-egl/main.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** 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$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include <qpa/qplatformintegrationplugin.h> #include "qwaylandbrcmeglplatformintegration.h" @@ -58,7 +22,7 @@ QPlatformIntegration *QWaylandBrcmEglPlatformIntegrationPlugin::create(const QSt Q_UNUSED(system); auto *integration = new QWaylandBrcmEglPlatformIntegration(); - if (integration->hasFailed()) { + if (!integration->init()) { delete integration; integration = nullptr; } diff --git a/src/plugins/platforms/qwayland-brcm-egl/qwayland-brcm-egl.pro b/src/plugins/platforms/qwayland-brcm-egl/qwayland-brcm-egl.pro deleted file mode 100644 index 6455aa311..000000000 --- a/src/plugins/platforms/qwayland-brcm-egl/qwayland-brcm-egl.pro +++ /dev/null @@ -1,12 +0,0 @@ -QT += waylandclient-private - -include(../../../hardwareintegration/client/brcm-egl/brcm-egl.pri) - -OTHER_FILES += \ - qwayland-brcm-egl.json - -SOURCES += main.cpp - -PLUGIN_TYPE = platforms -PLUGIN_CLASS_NAME = QWaylandBrcmEglPlatformIntegrationPlugin -load(qt_plugin) diff --git a/src/plugins/platforms/qwayland-brcm-egl/qwaylandbrcmeglplatformintegration.h b/src/plugins/platforms/qwayland-brcm-egl/qwaylandbrcmeglplatformintegration.h index 035846736..a781f5619 100644 --- a/src/plugins/platforms/qwayland-brcm-egl/qwaylandbrcmeglplatformintegration.h +++ b/src/plugins/platforms/qwayland-brcm-egl/qwaylandbrcmeglplatformintegration.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** 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$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QWAYLANDBRCMEGLPLATFORMINTEGRATION_H #define QWAYLANDBRCMEGLPLATFORMINTEGRATION_H diff --git a/src/plugins/platforms/qwayland-egl/CMakeLists.txt b/src/plugins/platforms/qwayland-egl/CMakeLists.txt new file mode 100644 index 000000000..6473ba151 --- /dev/null +++ b/src/plugins/platforms/qwayland-egl/CMakeLists.txt @@ -0,0 +1,24 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + +# Generated from qwayland-egl.pro. + +##################################################################### +## QWaylandEglPlatformIntegrationPlugin Plugin: +##################################################################### +qt_find_package(EGL) # special case + +qt_internal_add_plugin(QWaylandEglPlatformIntegrationPlugin + OUTPUT_NAME qwayland-egl + PLUGIN_TYPE platforms + SOURCES + main.cpp + LIBRARIES + Qt::Core + Qt::Gui + Qt::WaylandClientPrivate + Qt::WaylandEglClientHwIntegrationPrivate +) + +#### Keys ignored in scope 1:.:.:qwayland-egl.pro:<TRUE>: +# OTHER_FILES = "qwayland-egl.json" diff --git a/src/plugins/platforms/qwayland-egl/main.cpp b/src/plugins/platforms/qwayland-egl/main.cpp index 76b82b3b2..149f6fc83 100644 --- a/src/plugins/platforms/qwayland-egl/main.cpp +++ b/src/plugins/platforms/qwayland-egl/main.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** 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$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include <qpa/qplatformintegrationplugin.h> #include "qwaylandeglplatformintegration.h" @@ -58,7 +22,7 @@ QPlatformIntegration *QWaylandEglPlatformIntegrationPlugin::create(const QString Q_UNUSED(system); auto *integration = new QWaylandEglPlatformIntegration(); - if (integration->hasFailed()) { + if (!integration->init()) { delete integration; integration = nullptr; } diff --git a/src/plugins/platforms/qwayland-egl/qwayland-egl.pro b/src/plugins/platforms/qwayland-egl/qwayland-egl.pro deleted file mode 100644 index 9ac050dad..000000000 --- a/src/plugins/platforms/qwayland-egl/qwayland-egl.pro +++ /dev/null @@ -1,12 +0,0 @@ -QT += waylandclient-private - -include(../../../hardwareintegration/client/wayland-egl/wayland-egl.pri) - -OTHER_FILES += \ - qwayland-egl.json - -SOURCES += main.cpp - -PLUGIN_TYPE = platforms -PLUGIN_CLASS_NAME = QWaylandEglPlatformIntegrationPlugin -load(qt_plugin) diff --git a/src/plugins/platforms/qwayland-egl/qwaylandeglplatformintegration.h b/src/plugins/platforms/qwayland-egl/qwaylandeglplatformintegration.h index f2c8a154d..dfc252535 100644 --- a/src/plugins/platforms/qwayland-egl/qwaylandeglplatformintegration.h +++ b/src/plugins/platforms/qwayland-egl/qwaylandeglplatformintegration.h @@ -1,48 +1,12 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** 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$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QWAYLANDEGLPLATFORMINTEGRATION_H #define QWAYLANDEGLPLATFORMINTEGRATION_H #include <QtWaylandClient/private/qwaylandintegration_p.h> -#include "qwaylandeglclientbufferintegration.h" +#include <QtWaylandEglClientHwIntegration/private/qwaylandeglclientbufferintegration_p.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/qwayland-generic/CMakeLists.txt b/src/plugins/platforms/qwayland-generic/CMakeLists.txt new file mode 100644 index 000000000..d71d910a9 --- /dev/null +++ b/src/plugins/platforms/qwayland-generic/CMakeLists.txt @@ -0,0 +1,23 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + +# Generated from qwayland-generic.pro. + +##################################################################### +## QWaylandIntegrationPlugin Plugin: +##################################################################### + +qt_internal_add_plugin(QWaylandIntegrationPlugin + OUTPUT_NAME qwayland-generic + PLUGIN_TYPE platforms + DEFAULT_IF "wayland" IN_LIST QT_QPA_PLATFORMS + SOURCES + main.cpp + LIBRARIES + Qt::Core + Qt::Gui + Qt::WaylandClientPrivate +) + +#### Keys ignored in scope 1:.:.:qwayland-generic.pro:<TRUE>: +# OTHER_FILES = "qwayland-generic.json" diff --git a/src/plugins/platforms/qwayland-generic/main.cpp b/src/plugins/platforms/qwayland-generic/main.cpp index e66a5d45c..a3486d0d3 100644 --- a/src/plugins/platforms/qwayland-generic/main.cpp +++ b/src/plugins/platforms/qwayland-generic/main.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** 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$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include <qpa/qplatformintegrationplugin.h> #include <QtWaylandClient/private/qwaylandintegration_p.h> @@ -58,7 +22,7 @@ QPlatformIntegration *QWaylandIntegrationPlugin::create(const QString& system, c Q_UNUSED(system); auto *integration = new QWaylandIntegration(); - if (integration->hasFailed()) { + if (!integration->init()) { delete integration; integration = nullptr; } diff --git a/src/plugins/platforms/qwayland-generic/qwayland-generic.pro b/src/plugins/platforms/qwayland-generic/qwayland-generic.pro deleted file mode 100644 index bfeab3feb..000000000 --- a/src/plugins/platforms/qwayland-generic/qwayland-generic.pro +++ /dev/null @@ -1,10 +0,0 @@ -QT += waylandclient-private - -OTHER_FILES += \ - qwayland-generic.json - -SOURCES += main.cpp - -PLUGIN_TYPE = platforms -PLUGIN_CLASS_NAME = QWaylandIntegrationPlugin -load(qt_plugin) diff --git a/src/plugins/platforms/qwayland-xcomposite-egl/main.cpp b/src/plugins/platforms/qwayland-xcomposite-egl/main.cpp deleted file mode 100644 index d191bba92..000000000 --- a/src/plugins/platforms/qwayland-xcomposite-egl/main.cpp +++ /dev/null @@ -1,73 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** 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$ -** -****************************************************************************/ - -#include <qpa/qplatformintegrationplugin.h> -#include "qwaylandxcompositeeglplatformintegration.h" - -QT_BEGIN_NAMESPACE - -namespace QtWaylandClient { - -class QWaylandXCompositeEglPlatformIntegrationPlugin : public QPlatformIntegrationPlugin -{ - Q_OBJECT - Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid FILE "qwayland-xcomposite-egl.json") -public: - QPlatformIntegration *create(const QString&, const QStringList&) override; -}; - -QPlatformIntegration *QWaylandXCompositeEglPlatformIntegrationPlugin::create(const QString& system, const QStringList& paramList) -{ - Q_UNUSED(paramList); - Q_UNUSED(system); - auto *integration = new QWaylandXCompositeEglPlatformIntegration(); - - if (integration->hasFailed()) { - delete integration; - integration = nullptr; - } - - return integration; -} - -} - -QT_END_NAMESPACE - -#include "main.moc" diff --git a/src/plugins/platforms/qwayland-xcomposite-egl/qwayland-xcomposite-egl.json b/src/plugins/platforms/qwayland-xcomposite-egl/qwayland-xcomposite-egl.json deleted file mode 100644 index 03dac08bb..000000000 --- a/src/plugins/platforms/qwayland-xcomposite-egl/qwayland-xcomposite-egl.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "Keys": [ "wayland-xcomposite-egl" ] -} diff --git a/src/plugins/platforms/qwayland-xcomposite-egl/qwayland-xcomposite-egl.pro b/src/plugins/platforms/qwayland-xcomposite-egl/qwayland-xcomposite-egl.pro deleted file mode 100644 index 552460396..000000000 --- a/src/plugins/platforms/qwayland-xcomposite-egl/qwayland-xcomposite-egl.pro +++ /dev/null @@ -1,12 +0,0 @@ -QT += waylandclient-private - -include(../../../hardwareintegration/client/xcomposite-egl/xcomposite-egl.pri) - -OTHER_FILES += qwayland-xcomposite-egl.json - -SOURCES += \ - main.cpp - -PLUGIN_TYPE = platforms -PLUGIN_CLASS_NAME = QWaylandXCompositeEglPlatformIntegrationPlugin -load(qt_plugin) diff --git a/src/plugins/platforms/qwayland-xcomposite-egl/qwaylandxcompositeeglplatformintegration.h b/src/plugins/platforms/qwayland-xcomposite-egl/qwaylandxcompositeeglplatformintegration.h deleted file mode 100644 index e711133c0..000000000 --- a/src/plugins/platforms/qwayland-xcomposite-egl/qwaylandxcompositeeglplatformintegration.h +++ /dev/null @@ -1,71 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** 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 QWAYLANDXCOMPOSITEEGLPLATFROMINTEGRATION_H -#define QWAYLANDXCOMPOSITEEGLPLATFROMINTEGRATION_H - -#include <QtWaylandClient/private/qwaylandintegration_p.h> - -#include "qwaylandxcompositeeglclientbufferintegration.h" - -QT_BEGIN_NAMESPACE - -namespace QtWaylandClient { - -class QWaylandXCompositeEglPlatformIntegration : public QWaylandIntegration -{ -public: - QWaylandXCompositeEglPlatformIntegration() - : m_client_buffer_integration(new QWaylandXCompositeEGLClientBufferIntegration()) - { - m_client_buffer_integration->initialize(display()); - } - - QWaylandClientBufferIntegration *clientBufferIntegration() const override - { return m_client_buffer_integration; } - -private: - QWaylandClientBufferIntegration *m_client_buffer_integration; -}; - -} - -QT_END_NAMESPACE - -#endif diff --git a/src/plugins/platforms/qwayland-xcomposite-glx/main.cpp b/src/plugins/platforms/qwayland-xcomposite-glx/main.cpp deleted file mode 100644 index 1dfbc0cf4..000000000 --- a/src/plugins/platforms/qwayland-xcomposite-glx/main.cpp +++ /dev/null @@ -1,75 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** 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$ -** -****************************************************************************/ - -#include <qpa/qplatformintegrationplugin.h> -#include <QtWaylandClient/private/qwaylandintegration_p.h> - -#include "qwaylandxcompositeglxplatformintegration.h" - -QT_BEGIN_NAMESPACE - -namespace QtWaylandClient { - -class QWaylandXCompositeGlxPlatformIntegrationPlugin : public QPlatformIntegrationPlugin -{ - Q_OBJECT - Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid FILE "qwayland-xcomposite-glx.json") -public: - QPlatformIntegration *create(const QString&, const QStringList&) override; -}; - -QPlatformIntegration *QWaylandXCompositeGlxPlatformIntegrationPlugin::create(const QString& system, const QStringList& paramList) -{ - Q_UNUSED(paramList); - Q_UNUSED(system); - auto *integration = new QWaylandXCompositeGlxPlatformIntegration(); - - if (integration->hasFailed()) { - delete integration; - integration = nullptr; - } - - return integration; -} - -} - -QT_END_NAMESPACE - -#include "main.moc" diff --git a/src/plugins/platforms/qwayland-xcomposite-glx/qwayland-xcomposite-glx.json b/src/plugins/platforms/qwayland-xcomposite-glx/qwayland-xcomposite-glx.json deleted file mode 100644 index 0f4a3bf69..000000000 --- a/src/plugins/platforms/qwayland-xcomposite-glx/qwayland-xcomposite-glx.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "Keys": [ "wayland-xcomposite-glx" ] -} diff --git a/src/plugins/platforms/qwayland-xcomposite-glx/qwayland-xcomposite-glx.pro b/src/plugins/platforms/qwayland-xcomposite-glx/qwayland-xcomposite-glx.pro deleted file mode 100644 index 899d939bc..000000000 --- a/src/plugins/platforms/qwayland-xcomposite-glx/qwayland-xcomposite-glx.pro +++ /dev/null @@ -1,15 +0,0 @@ -QT += waylandclient-private - -include(../../../hardwareintegration/client/xcomposite-glx/xcomposite-glx.pri) - -OTHER_FILES += qwayland-xcomposite-glx.json - -SOURCES += \ - main.cpp - -HEADERS += \ - qwaylandxcompositeglxplatformintegration.h - -PLUGIN_TYPE = platforms -PLUGIN_CLASS_NAME = QWaylandXCompositeGlxPlatformIntegrationPlugin -load(qt_plugin) diff --git a/src/plugins/platforms/qwayland-xcomposite-glx/qwaylandxcompositeglxplatformintegration.h b/src/plugins/platforms/qwayland-xcomposite-glx/qwaylandxcompositeglxplatformintegration.h deleted file mode 100644 index 3e6eeea4d..000000000 --- a/src/plugins/platforms/qwayland-xcomposite-glx/qwaylandxcompositeglxplatformintegration.h +++ /dev/null @@ -1,72 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** 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 QWAYLANDXCOMPOSITEGLXPLATFORMINTEGRATION_H -#define QWAYLANDXCOMPOSITEGLXPLATFORMINTEGRATION_H - -#include <QtWaylandClient/private/qwaylandintegration_p.h> -#include <QtWaylandClient/private/qwaylanddisplay_p.h> - -#include "qwaylandxcompositeglxintegration.h" - -QT_BEGIN_NAMESPACE - -namespace QtWaylandClient { - -class QWaylandXCompositeGlxPlatformIntegration : public QWaylandIntegration -{ -public: - QWaylandXCompositeGlxPlatformIntegration() - : m_client_buffer_integration(new QWaylandXCompositeGLXIntegration()) - { - m_client_buffer_integration->initialize(display()); - } - - QWaylandClientBufferIntegration *clientBufferIntegration() const override - { return m_client_buffer_integration; } - -private: - QWaylandClientBufferIntegration *m_client_buffer_integration = nullptr; -}; - -} - -QT_END_NAMESPACE - -#endif |