diff options
Diffstat (limited to 'src/plugins/hardwareintegration/compositor')
46 files changed, 77 insertions, 853 deletions
diff --git a/src/plugins/hardwareintegration/compositor/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/CMakeLists.txt index 67ca5a4b3..8b281f881 100644 --- a/src/plugins/hardwareintegration/compositor/CMakeLists.txt +++ b/src/plugins/hardwareintegration/compositor/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from compositor.pro. add_subdirectory(hardwarelayer) @@ -11,12 +14,6 @@ endif() if(QT_FEATURE_wayland_brcm) add_subdirectory(brcm-egl) endif() -if(QT_FEATURE_xcomposite_egl) - add_subdirectory(xcomposite-egl) -endif() -if(QT_FEATURE_xcomposite_glx) - add_subdirectory(xcomposite-glx) -endif() if(QT_FEATURE_wayland_drm_egl_server_buffer) add_subdirectory(drm-egl-server) endif() diff --git a/src/plugins/hardwareintegration/compositor/brcm-egl/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/brcm-egl/CMakeLists.txt index f3b23112a..3f0e1d14d 100644 --- a/src/plugins/hardwareintegration/compositor/brcm-egl/CMakeLists.txt +++ b/src/plugins/hardwareintegration/compositor/brcm-egl/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from brcm-egl.pro. ##################################################################### @@ -6,7 +9,7 @@ qt_internal_add_plugin(QWaylandBrcmClientBufferIntegrationPlugin OUTPUT_NAME qt-wayland-compositor-brcm-egl - TYPE wayland-graphics-integration-server + PLUGIN_TYPE wayland-graphics-integration-server SOURCES ../../../../hardwareintegration/compositor/brcm-egl/brcmbuffer.cpp ../../../../hardwareintegration/compositor/brcm-egl/brcmbuffer.h ../../../../hardwareintegration/compositor/brcm-egl/brcmeglintegration.cpp ../../../../hardwareintegration/compositor/brcm-egl/brcmeglintegration.h diff --git a/src/plugins/hardwareintegration/compositor/brcm-egl/brcm-egl.pro b/src/plugins/hardwareintegration/compositor/brcm-egl/brcm-egl.pro deleted file mode 100644 index c89ecec00..000000000 --- a/src/plugins/hardwareintegration/compositor/brcm-egl/brcm-egl.pro +++ /dev/null @@ -1,14 +0,0 @@ -QT = waylandcompositor waylandcompositor-private core-private gui-private - -OTHER_FILES += brcm-egl.json - -SOURCES += \ - main.cpp - -TARGET = qt-wayland-compositor-brcm-egl - -include(../../../../hardwareintegration/compositor/brcm-egl/brcm-egl.pri) - -PLUGIN_TYPE = wayland-graphics-integration-server -PLUGIN_CLASS_NAME = QWaylandBrcmClientBufferIntegrationPlugin -load(qt_plugin) diff --git a/src/plugins/hardwareintegration/compositor/brcm-egl/main.cpp b/src/plugins/hardwareintegration/compositor/brcm-egl/main.cpp index 8792c36f6..320bb8ebb 100644 --- a/src/plugins/hardwareintegration/compositor/brcm-egl/main.cpp +++ b/src/plugins/hardwareintegration/compositor/brcm-egl/main.cpp @@ -1,31 +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:GPL$ -** 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 General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 or (at your option) 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.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-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtWaylandCompositor/private/qwlclientbufferintegrationplugin_p.h> #include "brcmeglintegration.h" diff --git a/src/plugins/hardwareintegration/compositor/compositor.pro b/src/plugins/hardwareintegration/compositor/compositor.pro deleted file mode 100644 index 32edf1f15..000000000 --- a/src/plugins/hardwareintegration/compositor/compositor.pro +++ /dev/null @@ -1,30 +0,0 @@ -TEMPLATE = subdirs -QT_FOR_CONFIG += waylandcompositor-private - -qtConfig(wayland-dmabuf-client-buffer): \ - SUBDIRS += linux-dmabuf-unstable-v1 -qtConfig(wayland-egl): \ - SUBDIRS += wayland-egl -qtConfig(wayland-brcm): \ - SUBDIRS += brcm-egl -qtConfig(xcomposite-egl): \ - SUBDIRS += xcomposite-egl -qtConfig(xcomposite-glx): \ - SUBDIRS += xcomposite-glx - -qtConfig(wayland-drm-egl-server-buffer): \ - SUBDIRS += drm-egl-server -qtConfig(wayland-libhybris-egl-server-buffer): \ - SUBDIRS += libhybris-egl-server -qtConfig(wayland-shm-emulation-server-buffer): \ - SUBDIRS += shm-emulation-server -qtConfig(wayland-dmabuf-server-buffer): \ - SUBDIRS += dmabuf-server -qtConfig(wayland-vulkan-server-buffer): \ - SUBDIRS += vulkan-server - -qtConfig(wayland-egl): \ - SUBDIRS += wayland-eglstream-controller - - -SUBDIRS += hardwarelayer diff --git a/src/plugins/hardwareintegration/compositor/dmabuf-server/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/dmabuf-server/CMakeLists.txt index e48671727..a6b48e998 100644 --- a/src/plugins/hardwareintegration/compositor/dmabuf-server/CMakeLists.txt +++ b/src/plugins/hardwareintegration/compositor/dmabuf-server/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from dmabuf-server.pro. ##################################################################### @@ -6,7 +9,7 @@ qt_internal_add_plugin(DmaBufServerBufferIntegrationPlugin OUTPUT_NAME qt-wayland-compositor-dmabuf-server-buffer - TYPE wayland-graphics-integration-server + PLUGIN_TYPE wayland-graphics-integration-server SOURCES ../../../../hardwareintegration/compositor/dmabuf-server/dmabufserverbufferintegration.cpp ../../../../hardwareintegration/compositor/dmabuf-server/dmabufserverbufferintegration.h main.cpp @@ -15,12 +18,11 @@ qt_internal_add_plugin(DmaBufServerBufferIntegrationPlugin LIBRARIES EGL::EGL Libdrm::Libdrm - Wayland::Server - PUBLIC_LIBRARIES Qt::CorePrivate Qt::GuiPrivate Qt::WaylandCompositor Qt::WaylandCompositorPrivate + Wayland::Server ) qt6_generate_wayland_protocol_server_sources(DmaBufServerBufferIntegrationPlugin diff --git a/src/plugins/hardwareintegration/compositor/dmabuf-server/dmabuf-server.pro b/src/plugins/hardwareintegration/compositor/dmabuf-server/dmabuf-server.pro deleted file mode 100644 index d96e58135..000000000 --- a/src/plugins/hardwareintegration/compositor/dmabuf-server/dmabuf-server.pro +++ /dev/null @@ -1,14 +0,0 @@ -QT = waylandcompositor waylandcompositor-private core-private gui-private - -OTHER_FILES += dmabuf-server.json - -SOURCES += \ - main.cpp - -TARGET = qt-wayland-compositor-dmabuf-server-buffer - -include(../../../../hardwareintegration/compositor/dmabuf-server/dmabuf-server.pri) - -PLUGIN_TYPE = wayland-graphics-integration-server -PLUGIN_CLASS_NAME = DmaBufServerBufferIntegrationPlugin -load(qt_plugin) diff --git a/src/plugins/hardwareintegration/compositor/dmabuf-server/main.cpp b/src/plugins/hardwareintegration/compositor/dmabuf-server/main.cpp index 57ca389dd..be2755419 100644 --- a/src/plugins/hardwareintegration/compositor/dmabuf-server/main.cpp +++ b/src/plugins/hardwareintegration/compositor/dmabuf-server/main.cpp @@ -1,31 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2018 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the plugins of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL$ -** 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 General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 or (at your option) 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.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-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2018 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtWaylandCompositor/private/qwlserverbufferintegrationplugin_p.h> #include "dmabufserverbufferintegration.h" diff --git a/src/plugins/hardwareintegration/compositor/drm-egl-server/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/drm-egl-server/CMakeLists.txt index af4eb7458..7dcd92ec8 100644 --- a/src/plugins/hardwareintegration/compositor/drm-egl-server/CMakeLists.txt +++ b/src/plugins/hardwareintegration/compositor/drm-egl-server/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from drm-egl-server.pro. ##################################################################### @@ -6,7 +9,7 @@ qt_internal_add_plugin(DrmEglServerBufferIntegrationPlugin OUTPUT_NAME qt-wayland-compositor-drm-egl-server-buffer - TYPE wayland-graphics-integration-server + PLUGIN_TYPE wayland-graphics-integration-server SOURCES ../../../../hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.cpp ../../../../hardwareintegration/compositor/drm-egl-server/drmeglserverbufferintegration.h main.cpp @@ -14,12 +17,11 @@ qt_internal_add_plugin(DrmEglServerBufferIntegrationPlugin ../../../../hardwareintegration/compositor/drm-egl-server LIBRARIES EGL::EGL - Wayland::Server - PUBLIC_LIBRARIES Qt::CorePrivate Qt::GuiPrivate Qt::WaylandCompositor Qt::WaylandCompositorPrivate + Wayland::Server ) qt6_generate_wayland_protocol_server_sources(DrmEglServerBufferIntegrationPlugin diff --git a/src/plugins/hardwareintegration/compositor/drm-egl-server/drm-egl-server.pro b/src/plugins/hardwareintegration/compositor/drm-egl-server/drm-egl-server.pro deleted file mode 100644 index 2ba17c388..000000000 --- a/src/plugins/hardwareintegration/compositor/drm-egl-server/drm-egl-server.pro +++ /dev/null @@ -1,14 +0,0 @@ -QT = waylandcompositor waylandcompositor-private core-private gui-private - -OTHER_FILES += drm-egl-server.json - -SOURCES += \ - main.cpp - -TARGET = qt-wayland-compositor-drm-egl-server-buffer - -include(../../../../hardwareintegration/compositor/drm-egl-server/drm-egl-server.pri) - -PLUGIN_TYPE = wayland-graphics-integration-server -PLUGIN_CLASS_NAME = DrmEglServerBufferIntegrationPlugin -load(qt_plugin) diff --git a/src/plugins/hardwareintegration/compositor/drm-egl-server/main.cpp b/src/plugins/hardwareintegration/compositor/drm-egl-server/main.cpp index c283b313b..67c65901b 100644 --- a/src/plugins/hardwareintegration/compositor/drm-egl-server/main.cpp +++ b/src/plugins/hardwareintegration/compositor/drm-egl-server/main.cpp @@ -1,31 +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:GPL$ -** 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 General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 or (at your option) 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.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-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtWaylandCompositor/private/qwlserverbufferintegrationplugin_p.h> #include "drmeglserverbufferintegration.h" diff --git a/src/plugins/hardwareintegration/compositor/hardwarelayer/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/hardwarelayer/CMakeLists.txt index 5a40a66b3..a5deccdb7 100644 --- a/src/plugins/hardwareintegration/compositor/hardwarelayer/CMakeLists.txt +++ b/src/plugins/hardwareintegration/compositor/hardwarelayer/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from hardwarelayer.pro. if(QT_FEATURE_wayland_layer_integration_vsp2) diff --git a/src/plugins/hardwareintegration/compositor/hardwarelayer/hardwarelayer.pro b/src/plugins/hardwareintegration/compositor/hardwarelayer/hardwarelayer.pro deleted file mode 100644 index 634447af7..000000000 --- a/src/plugins/hardwareintegration/compositor/hardwarelayer/hardwarelayer.pro +++ /dev/null @@ -1,5 +0,0 @@ -TEMPLATE = subdirs -QT_FOR_CONFIG += waylandcompositor-private - -qtConfig(wayland-layer-integration-vsp2): \ - SUBDIRS += vsp2 diff --git a/src/plugins/hardwareintegration/compositor/hardwarelayer/vsp2/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/hardwarelayer/vsp2/CMakeLists.txt index aa305ef79..27adac5fc 100644 --- a/src/plugins/hardwareintegration/compositor/hardwarelayer/vsp2/CMakeLists.txt +++ b/src/plugins/hardwareintegration/compositor/hardwarelayer/vsp2/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from vsp2.pro. ##################################################################### @@ -6,7 +9,7 @@ qt_internal_add_plugin(Vsp2HardwareLayerIntegrationPlugin OUTPUT_NAME qt-wayland-compositor-vsp2 - TYPE wayland-hardware-layer-integration + PLUGIN_TYPE wayland-hardware-layer-integration SOURCES ../../../../../hardwareintegration/compositor/hardwarelayer/vsp2/vsp2hardwarelayerintegration.cpp ../../../../../hardwareintegration/compositor/hardwarelayer/vsp2/vsp2hardwarelayerintegration.h main.cpp diff --git a/src/plugins/hardwareintegration/compositor/hardwarelayer/vsp2/main.cpp b/src/plugins/hardwareintegration/compositor/hardwarelayer/vsp2/main.cpp index 15cc070b6..5e1739b67 100644 --- a/src/plugins/hardwareintegration/compositor/hardwarelayer/vsp2/main.cpp +++ b/src/plugins/hardwareintegration/compositor/hardwarelayer/vsp2/main.cpp @@ -1,31 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2018 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the plugins of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL$ -** 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 General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 or (at your option) 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.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-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2018 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtWaylandCompositor/private/qwlhardwarelayerintegrationplugin_p.h> #include "vsp2hardwarelayerintegration.h" diff --git a/src/plugins/hardwareintegration/compositor/hardwarelayer/vsp2/vsp2.pro b/src/plugins/hardwareintegration/compositor/hardwarelayer/vsp2/vsp2.pro deleted file mode 100644 index c18884a96..000000000 --- a/src/plugins/hardwareintegration/compositor/hardwarelayer/vsp2/vsp2.pro +++ /dev/null @@ -1,16 +0,0 @@ -QT = waylandcompositor waylandcompositor-private core-private gui-private - -QMAKE_USE_PRIVATE += wayland-kms - -OTHER_FILES += vsp2.json - -SOURCES += \ - main.cpp - -TARGET = qt-wayland-compositor-vsp2 - -include(../../../../../hardwareintegration/compositor/hardwarelayer/vsp2/vsp2.pri) - -PLUGIN_TYPE = wayland-hardware-layer-integration -PLUGIN_CLASS_NAME = Vsp2HardwareLayerIntegrationPlugin -load(qt_plugin) diff --git a/src/plugins/hardwareintegration/compositor/libhybris-egl-server/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/libhybris-egl-server/CMakeLists.txt index 4d97d0345..cbd5e3740 100644 --- a/src/plugins/hardwareintegration/compositor/libhybris-egl-server/CMakeLists.txt +++ b/src/plugins/hardwareintegration/compositor/libhybris-egl-server/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from libhybris-egl-server.pro. ##################################################################### @@ -6,7 +9,7 @@ qt_internal_add_plugin(LibHybrisEglServerBufferIntegrationPlugin OUTPUT_NAME qt-wayland-compositor-libybris-egl-server.json - TYPE wayland-graphics-integration-server + PLUGIN_TYPE wayland-graphics-integration-server SOURCES ../../../../hardwareintegration/compositor/libhybris-egl-server/libhybriseglserverbufferintegration.cpp ../../../../hardwareintegration/compositor/libhybris-egl-server/libhybriseglserverbufferintegration.h main.cpp diff --git a/src/plugins/hardwareintegration/compositor/libhybris-egl-server/libhybris-egl-server.pro b/src/plugins/hardwareintegration/compositor/libhybris-egl-server/libhybris-egl-server.pro deleted file mode 100644 index c9c3a0daf..000000000 --- a/src/plugins/hardwareintegration/compositor/libhybris-egl-server/libhybris-egl-server.pro +++ /dev/null @@ -1,14 +0,0 @@ -QT = waylandcompositor waylandcompositor-private core-private gui-private - -OTHER_FILES += libhybris-egl-server.json - -SOURCES += \ - main.cpp - -TARGET = qt-wayland-compositor-libybris-egl-server.json - -include(../../../../hardwareintegration/compositor/libhybris-egl-server/libhybris-egl-server.pri) - -PLUGIN_TYPE = wayland-graphics-integration-server -PLUGIN_CLASS_NAME = LibHybrisEglServerBufferIntegrationPlugin -load(qt_plugin) diff --git a/src/plugins/hardwareintegration/compositor/libhybris-egl-server/main.cpp b/src/plugins/hardwareintegration/compositor/libhybris-egl-server/main.cpp index da015ed95..5c7ef164f 100644 --- a/src/plugins/hardwareintegration/compositor/libhybris-egl-server/main.cpp +++ b/src/plugins/hardwareintegration/compositor/libhybris-egl-server/main.cpp @@ -1,31 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 Jolla Ltd, author: <giulio.camuffo@jollamobile.com> -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the plugins of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL$ -** 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 General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 or (at your option) 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.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-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 Jolla Ltd, author: <giulio.camuffo@jollamobile.com> +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtWaylandCompositor/private/qwlserverbufferintegrationplugin_p.h> #include <QtWaylandCompositor/private/qwlserverbufferintegration_p.h> diff --git a/src/plugins/hardwareintegration/compositor/linux-dmabuf-unstable-v1/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/linux-dmabuf-unstable-v1/CMakeLists.txt index 6061fce4d..f6141b79e 100644 --- a/src/plugins/hardwareintegration/compositor/linux-dmabuf-unstable-v1/CMakeLists.txt +++ b/src/plugins/hardwareintegration/compositor/linux-dmabuf-unstable-v1/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from linux-dmabuf-unstable-v1.pro. ##################################################################### @@ -6,7 +9,7 @@ qt_internal_add_plugin(QWaylandDmabufClientBufferIntegrationPlugin OUTPUT_NAME qt-wayland-compositor-linux-dmabuf-unstable-v1 - TYPE wayland-graphics-integration-server + PLUGIN_TYPE wayland-graphics-integration-server SOURCES ../../../../hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.cpp ../../../../hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h ../../../../hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabufclientbufferintegration.cpp ../../../../hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabufclientbufferintegration.h @@ -17,7 +20,6 @@ qt_internal_add_plugin(QWaylandDmabufClientBufferIntegrationPlugin EGL::EGL Libdrm::Libdrm Wayland::Server - PUBLIC_LIBRARIES Qt::CorePrivate Qt::GuiPrivate Qt::WaylandCompositor diff --git a/src/plugins/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linux-dmabuf-unstable-v1.pro b/src/plugins/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linux-dmabuf-unstable-v1.pro deleted file mode 100644 index 1f76f9f00..000000000 --- a/src/plugins/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linux-dmabuf-unstable-v1.pro +++ /dev/null @@ -1,14 +0,0 @@ -QT = waylandcompositor waylandcompositor-private core-private gui-private - -OTHER_FILES += linux-dmabuf.json - -SOURCES += \ - main.cpp \ - -TARGET = qt-wayland-compositor-linux-dmabuf-unstable-v1 - -include(../../../../hardwareintegration/compositor/linux-dmabuf-unstable-v1/linux-dmabuf-unstable-v1.pri) - -PLUGIN_TYPE = wayland-graphics-integration-server -PLUGIN_CLASS_NAME = QWaylandDmabufClientBufferIntegrationPlugin -load(qt_plugin) diff --git a/src/plugins/hardwareintegration/compositor/linux-dmabuf-unstable-v1/main.cpp b/src/plugins/hardwareintegration/compositor/linux-dmabuf-unstable-v1/main.cpp index a12ebff02..aa19438df 100644 --- a/src/plugins/hardwareintegration/compositor/linux-dmabuf-unstable-v1/main.cpp +++ b/src/plugins/hardwareintegration/compositor/linux-dmabuf-unstable-v1/main.cpp @@ -1,31 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2018 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the plugins of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL$ -** 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 General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 or (at your option) 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.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-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2018 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtWaylandCompositor/private/qwlclientbufferintegrationfactory_p.h> #include <QtWaylandCompositor/private/qwlclientbufferintegrationplugin_p.h> diff --git a/src/plugins/hardwareintegration/compositor/shm-emulation-server/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/shm-emulation-server/CMakeLists.txt index 0887c5176..e893102ad 100644 --- a/src/plugins/hardwareintegration/compositor/shm-emulation-server/CMakeLists.txt +++ b/src/plugins/hardwareintegration/compositor/shm-emulation-server/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from shm-emulation-server.pro. ##################################################################### @@ -6,19 +9,18 @@ qt_internal_add_plugin(ShmServerBufferIntegrationPlugin OUTPUT_NAME qt-wayland-compositor-shm-emulation-server - TYPE wayland-graphics-integration-server + PLUGIN_TYPE wayland-graphics-integration-server SOURCES ../../../../hardwareintegration/compositor/shm-emulation-server/shmserverbufferintegration.cpp ../../../../hardwareintegration/compositor/shm-emulation-server/shmserverbufferintegration.h main.cpp INCLUDE_DIRECTORIES ../../../../hardwareintegration/compositor/shm-emulation-server LIBRARIES - Wayland::Server - PUBLIC_LIBRARIES Qt::CorePrivate Qt::GuiPrivate Qt::WaylandCompositor Qt::WaylandCompositorPrivate + Wayland::Server ) qt6_generate_wayland_protocol_server_sources(ShmServerBufferIntegrationPlugin diff --git a/src/plugins/hardwareintegration/compositor/shm-emulation-server/main.cpp b/src/plugins/hardwareintegration/compositor/shm-emulation-server/main.cpp index df3d2ed83..266624618 100644 --- a/src/plugins/hardwareintegration/compositor/shm-emulation-server/main.cpp +++ b/src/plugins/hardwareintegration/compositor/shm-emulation-server/main.cpp @@ -1,31 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the plugins of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL$ -** 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 General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 or (at your option) 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.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-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2017 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtWaylandCompositor/private/qwlserverbufferintegrationplugin_p.h> #include "shmserverbufferintegration.h" diff --git a/src/plugins/hardwareintegration/compositor/shm-emulation-server/shm-emulation-server.pro b/src/plugins/hardwareintegration/compositor/shm-emulation-server/shm-emulation-server.pro deleted file mode 100644 index 865af1a7d..000000000 --- a/src/plugins/hardwareintegration/compositor/shm-emulation-server/shm-emulation-server.pro +++ /dev/null @@ -1,14 +0,0 @@ -QT = waylandcompositor waylandcompositor-private core-private gui-private - -OTHER_FILES += shm-emulation-server.json - -SOURCES += \ - main.cpp - -TARGET = qt-wayland-compositor-shm-emulation-server - -include(../../../../hardwareintegration/compositor/shm-emulation-server/shm-emulation-server.pri) - -PLUGIN_TYPE = wayland-graphics-integration-server -PLUGIN_CLASS_NAME = ShmServerBufferIntegrationPlugin -load(qt_plugin) diff --git a/src/plugins/hardwareintegration/compositor/vulkan-server/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/vulkan-server/CMakeLists.txt index 661cdac9b..123ec8528 100644 --- a/src/plugins/hardwareintegration/compositor/vulkan-server/CMakeLists.txt +++ b/src/plugins/hardwareintegration/compositor/vulkan-server/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from vulkan-server.pro. ##################################################################### @@ -6,7 +9,7 @@ qt_internal_add_plugin(VulkanServerBufferIntegrationPlugin OUTPUT_NAME qt-wayland-compositor-vulkan-server - TYPE wayland-graphics-integration-server + PLUGIN_TYPE wayland-graphics-integration-server SOURCES ../../../../hardwareintegration/compositor/vulkan-server/vulkanserverbufferintegration.cpp ../../../../hardwareintegration/compositor/vulkan-server/vulkanserverbufferintegration.h ../../../../hardwareintegration/compositor/vulkan-server/vulkanwrapper.cpp ../../../../hardwareintegration/compositor/vulkan-server/vulkanwrapper.h @@ -15,13 +18,12 @@ qt_internal_add_plugin(VulkanServerBufferIntegrationPlugin ../../../../hardwareintegration/compositor/vulkan-server ../../../../hardwareintegration/compositor/vulkan-server/../../../3rdparty/util LIBRARIES - Wayland::Server - PUBLIC_LIBRARIES Qt::CorePrivate Qt::GuiPrivate Qt::OpenGLPrivate Qt::WaylandCompositor Qt::WaylandCompositorPrivate + Wayland::Server ) qt6_generate_wayland_protocol_server_sources(VulkanServerBufferIntegrationPlugin diff --git a/src/plugins/hardwareintegration/compositor/vulkan-server/main.cpp b/src/plugins/hardwareintegration/compositor/vulkan-server/main.cpp index 5b2567f07..64f013830 100644 --- a/src/plugins/hardwareintegration/compositor/vulkan-server/main.cpp +++ b/src/plugins/hardwareintegration/compositor/vulkan-server/main.cpp @@ -1,31 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2019 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the plugins of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL$ -** 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 General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 or (at your option) 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.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-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2019 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtWaylandCompositor/private/qwlserverbufferintegrationplugin_p.h> #include "vulkanserverbufferintegration.h" diff --git a/src/plugins/hardwareintegration/compositor/vulkan-server/vulkan-server.pro b/src/plugins/hardwareintegration/compositor/vulkan-server/vulkan-server.pro deleted file mode 100644 index dc82c3f26..000000000 --- a/src/plugins/hardwareintegration/compositor/vulkan-server/vulkan-server.pro +++ /dev/null @@ -1,14 +0,0 @@ -QT = waylandcompositor waylandcompositor-private core-private gui-private - -OTHER_FILES += vulkan-server.json - -SOURCES += \ - main.cpp - -TARGET = qt-wayland-compositor-vulkan-server - -include(../../../../hardwareintegration/compositor/vulkan-server/vulkan-server.pri) - -PLUGIN_TYPE = wayland-graphics-integration-server -PLUGIN_CLASS_NAME = VulkanServerBufferIntegrationPlugin -load(qt_plugin) diff --git a/src/plugins/hardwareintegration/compositor/wayland-egl/.prev_CMakeLists.txt b/src/plugins/hardwareintegration/compositor/wayland-egl/.prev_CMakeLists.txt deleted file mode 100644 index ebaf1ee1d..000000000 --- a/src/plugins/hardwareintegration/compositor/wayland-egl/.prev_CMakeLists.txt +++ /dev/null @@ -1,27 +0,0 @@ -# Generated from wayland-egl.pro. - -##################################################################### -## QWaylandEglClientBufferIntegrationPlugin Plugin: -##################################################################### - -qt_internal_add_plugin(QWaylandEglClientBufferIntegrationPlugin - OUTPUT_NAME qt-wayland-compositor-wayland-egl - TYPE wayland-graphics-integration-server - SOURCES - ../../../../hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp ../../../../hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.h - main.cpp - INCLUDE_DIRECTORIES - ../../../../hardwareintegration/compositor/wayland-egl - LIBRARIES - EGL::EGL - Wayland::Egl - Wayland::Server - PUBLIC_LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::WaylandCompositor - Qt::WaylandCompositorPrivate -) - -#### Keys ignored in scope 1:.:.:wayland-egl.pro:<TRUE>: -# OTHER_FILES = "wayland-egl.json" diff --git a/src/plugins/hardwareintegration/compositor/wayland-egl/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/wayland-egl/CMakeLists.txt index e631743b7..a85351c29 100644 --- a/src/plugins/hardwareintegration/compositor/wayland-egl/CMakeLists.txt +++ b/src/plugins/hardwareintegration/compositor/wayland-egl/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from wayland-egl.pro. ##################################################################### @@ -7,21 +10,15 @@ qt_find_package(EGL) # special case qt_internal_add_plugin(QWaylandEglClientBufferIntegrationPlugin OUTPUT_NAME qt-wayland-compositor-wayland-egl - TYPE wayland-graphics-integration-server + PLUGIN_TYPE wayland-graphics-integration-server SOURCES - ../../../../hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp ../../../../hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.h main.cpp - INCLUDE_DIRECTORIES - ../../../../hardwareintegration/compositor/wayland-egl LIBRARIES - EGL::EGL - Wayland::Egl - Wayland::Server - PUBLIC_LIBRARIES Qt::CorePrivate Qt::GuiPrivate Qt::WaylandCompositor Qt::WaylandCompositorPrivate + Qt::WaylandEglCompositorHwIntegrationPrivate ) #### Keys ignored in scope 1:.:.:wayland-egl.pro:<TRUE>: diff --git a/src/plugins/hardwareintegration/compositor/wayland-egl/main.cpp b/src/plugins/hardwareintegration/compositor/wayland-egl/main.cpp index 0197675b9..7258eb507 100644 --- a/src/plugins/hardwareintegration/compositor/wayland-egl/main.cpp +++ b/src/plugins/hardwareintegration/compositor/wayland-egl/main.cpp @@ -1,35 +1,9 @@ -/**************************************************************************** -** -** 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:GPL$ -** 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 General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 or (at your option) 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.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-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtWaylandCompositor/private/qwlclientbufferintegrationfactory_p.h> #include <QtWaylandCompositor/private/qwlclientbufferintegrationplugin_p.h> -#include "waylandeglclientbufferintegration.h" +#include <QtWaylandEglCompositorHwIntegration/private/waylandeglclientbufferintegration_p.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/hardwareintegration/compositor/wayland-egl/wayland-egl.pro b/src/plugins/hardwareintegration/compositor/wayland-egl/wayland-egl.pro deleted file mode 100644 index d452220c5..000000000 --- a/src/plugins/hardwareintegration/compositor/wayland-egl/wayland-egl.pro +++ /dev/null @@ -1,14 +0,0 @@ -QT = waylandcompositor waylandcompositor-private core-private gui-private - -OTHER_FILES += wayland-egl.json - -SOURCES += \ - main.cpp - -TARGET = qt-wayland-compositor-wayland-egl - -include(../../../../hardwareintegration/compositor/wayland-egl/wayland-egl.pri) - -PLUGIN_TYPE = wayland-graphics-integration-server -PLUGIN_CLASS_NAME = QWaylandEglClientBufferIntegrationPlugin -load(qt_plugin) diff --git a/src/plugins/hardwareintegration/compositor/wayland-eglstream-controller/.prev_CMakeLists.txt b/src/plugins/hardwareintegration/compositor/wayland-eglstream-controller/.prev_CMakeLists.txt deleted file mode 100644 index 3cb4692eb..000000000 --- a/src/plugins/hardwareintegration/compositor/wayland-eglstream-controller/.prev_CMakeLists.txt +++ /dev/null @@ -1,33 +0,0 @@ -# Generated from wayland-eglstream-controller.pro. - -##################################################################### -## QWaylandEglStreamBufferIntegrationPlugin Plugin: -##################################################################### - -qt_internal_add_plugin(QWaylandEglStreamBufferIntegrationPlugin - OUTPUT_NAME qt-wayland-compositor-wayland-eglstream-controller - TYPE wayland-graphics-integration-server - SOURCES - ../../../../hardwareintegration/compositor/wayland-eglstream-controller/waylandeglstreamcontroller.cpp ../../../../hardwareintegration/compositor/wayland-eglstream-controller/waylandeglstreamcontroller.h - ../../../../hardwareintegration/compositor/wayland-eglstream-controller/waylandeglstreamintegration.cpp ../../../../hardwareintegration/compositor/wayland-eglstream-controller/waylandeglstreamintegration.h - main.cpp - INCLUDE_DIRECTORIES - ../../../../hardwareintegration/compositor/wayland-eglstream-controller - LIBRARIES - EGL::EGL - Wayland::Egl - Wayland::Server - PUBLIC_LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::WaylandCompositor - Qt::WaylandCompositorPrivate -) - -qt6_generate_wayland_protocol_server_sources(QWaylandEglStreamBufferIntegrationPlugin - FILES - ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/compositor/wayland-eglstream-controller/../../../3rdparty/protocol/wl-eglstream-controller.xml -) - -#### Keys ignored in scope 1:.:.:wayland-eglstream-controller.pro:<TRUE>: -# OTHER_FILES = "wayland-eglstream-controller.json" diff --git a/src/plugins/hardwareintegration/compositor/wayland-eglstream-controller/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/wayland-eglstream-controller/CMakeLists.txt index 3cbe8f822..39c97bc5f 100644 --- a/src/plugins/hardwareintegration/compositor/wayland-eglstream-controller/CMakeLists.txt +++ b/src/plugins/hardwareintegration/compositor/wayland-eglstream-controller/CMakeLists.txt @@ -1,13 +1,16 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from wayland-eglstream-controller.pro. ##################################################################### -## QWaylandEglStreamBufferIntegrationPlugin Plugin: +## QWaylandEglStreamClientBufferIntegrationPlugin Plugin: ##################################################################### qt_find_package(EGL) # special case -qt_internal_add_plugin(QWaylandEglStreamBufferIntegrationPlugin +qt_internal_add_plugin(QWaylandEglStreamClientBufferIntegrationPlugin OUTPUT_NAME qt-wayland-compositor-wayland-eglstream-controller - TYPE wayland-graphics-integration-server + PLUGIN_TYPE wayland-graphics-integration-server SOURCES ../../../../hardwareintegration/compositor/wayland-eglstream-controller/waylandeglstreamcontroller.cpp ../../../../hardwareintegration/compositor/wayland-eglstream-controller/waylandeglstreamcontroller.h ../../../../hardwareintegration/compositor/wayland-eglstream-controller/waylandeglstreamintegration.cpp ../../../../hardwareintegration/compositor/wayland-eglstream-controller/waylandeglstreamintegration.h @@ -16,16 +19,15 @@ qt_internal_add_plugin(QWaylandEglStreamBufferIntegrationPlugin ../../../../hardwareintegration/compositor/wayland-eglstream-controller LIBRARIES EGL::EGL - Wayland::Egl - Wayland::Server - PUBLIC_LIBRARIES Qt::CorePrivate Qt::GuiPrivate Qt::WaylandCompositor Qt::WaylandCompositorPrivate + Wayland::Egl + Wayland::Server ) -qt6_generate_wayland_protocol_server_sources(QWaylandEglStreamBufferIntegrationPlugin +qt6_generate_wayland_protocol_server_sources(QWaylandEglStreamClientBufferIntegrationPlugin FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/compositor/wayland-eglstream-controller/../../../3rdparty/protocol/wl-eglstream-controller.xml ) diff --git a/src/plugins/hardwareintegration/compositor/wayland-eglstream-controller/main.cpp b/src/plugins/hardwareintegration/compositor/wayland-eglstream-controller/main.cpp index 06a69e51d..0eb62b6a0 100644 --- a/src/plugins/hardwareintegration/compositor/wayland-eglstream-controller/main.cpp +++ b/src/plugins/hardwareintegration/compositor/wayland-eglstream-controller/main.cpp @@ -1,31 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2019 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the plugins of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL$ -** 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 General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 or (at your option) 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.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-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2019 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtWaylandCompositor/private/qwlclientbufferintegrationfactory_p.h> #include <QtWaylandCompositor/private/qwlclientbufferintegrationplugin_p.h> diff --git a/src/plugins/hardwareintegration/compositor/wayland-eglstream-controller/wayland-eglstream-controller.pro b/src/plugins/hardwareintegration/compositor/wayland-eglstream-controller/wayland-eglstream-controller.pro deleted file mode 100644 index 0d1bfb0ea..000000000 --- a/src/plugins/hardwareintegration/compositor/wayland-eglstream-controller/wayland-eglstream-controller.pro +++ /dev/null @@ -1,14 +0,0 @@ -QT = waylandcompositor waylandcompositor-private core-private gui-private - -OTHER_FILES += wayland-eglstream-controller.json - -SOURCES += \ - main.cpp \ - -TARGET = qt-wayland-compositor-wayland-eglstream-controller - -include(../../../../hardwareintegration/compositor/wayland-eglstream-controller/wayland-eglstream-controller.pri) - -PLUGIN_TYPE = wayland-graphics-integration-server -PLUGIN_CLASS_NAME = QWaylandEglStreamClientBufferIntegrationPlugin -load(qt_plugin) diff --git a/src/plugins/hardwareintegration/compositor/xcomposite-egl/.prev_CMakeLists.txt b/src/plugins/hardwareintegration/compositor/xcomposite-egl/.prev_CMakeLists.txt deleted file mode 100644 index 2492b259b..000000000 --- a/src/plugins/hardwareintegration/compositor/xcomposite-egl/.prev_CMakeLists.txt +++ /dev/null @@ -1,40 +0,0 @@ -# Generated from xcomposite-egl.pro. - -##################################################################### -## QWaylandXCompositeEglClientBufferIntegrationPlugin Plugin: -##################################################################### - -qt_internal_add_plugin(QWaylandXCompositeEglClientBufferIntegrationPlugin - OUTPUT_NAME qt-wayland-compositor-xcomposite-egl - TYPE wayland-graphics-integration-server - SOURCES - ../../../../hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.cpp ../../../../hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.h - ../../../../hardwareintegration/compositor/xcomposite_share/xcompositebuffer.cpp ../../../../hardwareintegration/compositor/xcomposite_share/xcompositebuffer.h - ../../../../hardwareintegration/compositor/xcomposite_share/xcompositehandler.cpp ../../../../hardwareintegration/compositor/xcomposite_share/xcompositehandler.h - ../../../../hardwareintegration/compositor/xcomposite_share/xlibinclude.h - main.cpp - INCLUDE_DIRECTORIES - ../../../../hardwareintegration/compositor/xcomposite-egl - ../../../../hardwareintegration/compositor/xcomposite_share - LIBRARIES - EGL::EGL - Wayland::Server - X11::X11 - PUBLIC_LIBRARIES - PkgConfig::XComposite - Qt::Core - Qt::CorePrivate - Qt::Gui - Qt::GuiPrivate - Qt::WaylandCompositor - Qt::WaylandCompositorPrivate -) - -qt6_generate_wayland_protocol_server_sources(QWaylandXCompositeEglClientBufferIntegrationPlugin - FILES - ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/compositor/xcomposite_share/../../../3rdparty/protocol/wayland.xml - ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/compositor/xcomposite_share/../../../extensions/xcomposite.xml -) - -#### Keys ignored in scope 1:.:.:xcomposite-egl.pro:<TRUE>: -# OTHER_FILES = "xcomposite-egl.json" diff --git a/src/plugins/hardwareintegration/compositor/xcomposite-egl/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/xcomposite-egl/CMakeLists.txt deleted file mode 100644 index 28a1c155d..000000000 --- a/src/plugins/hardwareintegration/compositor/xcomposite-egl/CMakeLists.txt +++ /dev/null @@ -1,41 +0,0 @@ -# Generated from xcomposite-egl.pro. - -##################################################################### -## QWaylandXCompositeEglClientBufferIntegrationPlugin Plugin: -##################################################################### -qt_find_package(EGL) # special case - -qt_internal_add_plugin(QWaylandXCompositeEglClientBufferIntegrationPlugin - OUTPUT_NAME qt-wayland-compositor-xcomposite-egl - TYPE wayland-graphics-integration-server - SOURCES - ../../../../hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.cpp ../../../../hardwareintegration/compositor/xcomposite-egl/xcompositeeglintegration.h - ../../../../hardwareintegration/compositor/xcomposite_share/xcompositebuffer.cpp ../../../../hardwareintegration/compositor/xcomposite_share/xcompositebuffer.h - ../../../../hardwareintegration/compositor/xcomposite_share/xcompositehandler.cpp ../../../../hardwareintegration/compositor/xcomposite_share/xcompositehandler.h - ../../../../hardwareintegration/compositor/xcomposite_share/xlibinclude.h - main.cpp - INCLUDE_DIRECTORIES - ../../../../hardwareintegration/compositor/xcomposite-egl - ../../../../hardwareintegration/compositor/xcomposite_share - LIBRARIES - EGL::EGL - Wayland::Server - X11::X11 - PUBLIC_LIBRARIES - PkgConfig::XComposite - Qt::Core - Qt::CorePrivate - Qt::Gui - Qt::GuiPrivate - Qt::WaylandCompositor - Qt::WaylandCompositorPrivate -) - -qt6_generate_wayland_protocol_server_sources(QWaylandXCompositeEglClientBufferIntegrationPlugin - FILES - ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/compositor/xcomposite_share/../../../3rdparty/protocol/wayland.xml - ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/compositor/xcomposite_share/../../../extensions/xcomposite.xml -) - -#### Keys ignored in scope 1:.:.:xcomposite-egl.pro:<TRUE>: -# OTHER_FILES = "xcomposite-egl.json" diff --git a/src/plugins/hardwareintegration/compositor/xcomposite-egl/main.cpp b/src/plugins/hardwareintegration/compositor/xcomposite-egl/main.cpp deleted file mode 100644 index dda589e29..000000000 --- a/src/plugins/hardwareintegration/compositor/xcomposite-egl/main.cpp +++ /dev/null @@ -1,52 +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:GPL$ -** 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 General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 or (at your option) 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.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-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include <QtWaylandCompositor/private/qwlclientbufferintegrationplugin_p.h> -#include "xcompositeeglintegration.h" - -QT_BEGIN_NAMESPACE - -class QWaylandXCompositeEglClientBufferIntegrationPlugin : public QtWayland::ClientBufferIntegrationPlugin -{ - Q_OBJECT - Q_PLUGIN_METADATA(IID QtWaylandClientBufferIntegrationFactoryInterface_iid FILE "xcomposite-egl.json") -public: - QtWayland::ClientBufferIntegration *create(const QString&, const QStringList&) override; -}; - -QtWayland::ClientBufferIntegration *QWaylandXCompositeEglClientBufferIntegrationPlugin::create(const QString& system, const QStringList& paramList) -{ - Q_UNUSED(paramList); - Q_UNUSED(system); - return new XCompositeEglClientBufferIntegration(); -} - -QT_END_NAMESPACE - -#include "main.moc" diff --git a/src/plugins/hardwareintegration/compositor/xcomposite-egl/xcomposite-egl.json b/src/plugins/hardwareintegration/compositor/xcomposite-egl/xcomposite-egl.json deleted file mode 100644 index 0d119ff85..000000000 --- a/src/plugins/hardwareintegration/compositor/xcomposite-egl/xcomposite-egl.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "Keys": [ "xcomposite-egl" ] -} diff --git a/src/plugins/hardwareintegration/compositor/xcomposite-egl/xcomposite-egl.pro b/src/plugins/hardwareintegration/compositor/xcomposite-egl/xcomposite-egl.pro deleted file mode 100644 index 298ed2fc6..000000000 --- a/src/plugins/hardwareintegration/compositor/xcomposite-egl/xcomposite-egl.pro +++ /dev/null @@ -1,14 +0,0 @@ -QT += waylandcompositor waylandcompositor-private core-private gui-private - -OTHER_FILES += xcomposite-egl.json - -SOURCES += \ - main.cpp - -TARGET = qt-wayland-compositor-xcomposite-egl - -include(../../../../hardwareintegration/compositor/xcomposite-egl/xcomposite-egl.pri) - -PLUGIN_TYPE = wayland-graphics-integration-server -PLUGIN_CLASS_NAME = QWaylandXCompositeEglClientBufferIntegrationPlugin -load(qt_plugin) diff --git a/src/plugins/hardwareintegration/compositor/xcomposite-glx/.prev_CMakeLists.txt b/src/plugins/hardwareintegration/compositor/xcomposite-glx/.prev_CMakeLists.txt deleted file mode 100644 index c32b25ba7..000000000 --- a/src/plugins/hardwareintegration/compositor/xcomposite-glx/.prev_CMakeLists.txt +++ /dev/null @@ -1,39 +0,0 @@ -# Generated from xcomposite-glx.pro. - -##################################################################### -## QWaylandXCompositeGlxClientBufferIntegrationPlugin Plugin: -##################################################################### - -qt_internal_add_plugin(QWaylandXCompositeGlxClientBufferIntegrationPlugin - OUTPUT_NAME qt-wayland-compositor-xcomposite-glx - TYPE wayland-graphics-integration-server - SOURCES - ../../../../hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.cpp ../../../../hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.h - ../../../../hardwareintegration/compositor/xcomposite_share/xcompositebuffer.cpp ../../../../hardwareintegration/compositor/xcomposite_share/xcompositebuffer.h - ../../../../hardwareintegration/compositor/xcomposite_share/xcompositehandler.cpp ../../../../hardwareintegration/compositor/xcomposite_share/xcompositehandler.h - ../../../../hardwareintegration/compositor/xcomposite_share/xlibinclude.h - main.cpp - INCLUDE_DIRECTORIES - ../../../../hardwareintegration/compositor/xcomposite-glx - ../../../../hardwareintegration/compositor/xcomposite_share - LIBRARIES - Wayland::Server - X11::X11 - PUBLIC_LIBRARIES - PkgConfig::XComposite - Qt::Core - Qt::CorePrivate - Qt::Gui - Qt::GuiPrivate - Qt::WaylandCompositor - Qt::WaylandCompositorPrivate -) - -qt6_generate_wayland_protocol_server_sources(QWaylandXCompositeGlxClientBufferIntegrationPlugin - FILES - ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/compositor/xcomposite_share/../../../3rdparty/protocol/wayland.xml - ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/compositor/xcomposite_share/../../../extensions/xcomposite.xml -) - -#### Keys ignored in scope 1:.:.:xcomposite-glx.pro:<TRUE>: -# OTHER_FILES = "xcomposite-glx.json" diff --git a/src/plugins/hardwareintegration/compositor/xcomposite-glx/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/xcomposite-glx/CMakeLists.txt deleted file mode 100644 index c32b25ba7..000000000 --- a/src/plugins/hardwareintegration/compositor/xcomposite-glx/CMakeLists.txt +++ /dev/null @@ -1,39 +0,0 @@ -# Generated from xcomposite-glx.pro. - -##################################################################### -## QWaylandXCompositeGlxClientBufferIntegrationPlugin Plugin: -##################################################################### - -qt_internal_add_plugin(QWaylandXCompositeGlxClientBufferIntegrationPlugin - OUTPUT_NAME qt-wayland-compositor-xcomposite-glx - TYPE wayland-graphics-integration-server - SOURCES - ../../../../hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.cpp ../../../../hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.h - ../../../../hardwareintegration/compositor/xcomposite_share/xcompositebuffer.cpp ../../../../hardwareintegration/compositor/xcomposite_share/xcompositebuffer.h - ../../../../hardwareintegration/compositor/xcomposite_share/xcompositehandler.cpp ../../../../hardwareintegration/compositor/xcomposite_share/xcompositehandler.h - ../../../../hardwareintegration/compositor/xcomposite_share/xlibinclude.h - main.cpp - INCLUDE_DIRECTORIES - ../../../../hardwareintegration/compositor/xcomposite-glx - ../../../../hardwareintegration/compositor/xcomposite_share - LIBRARIES - Wayland::Server - X11::X11 - PUBLIC_LIBRARIES - PkgConfig::XComposite - Qt::Core - Qt::CorePrivate - Qt::Gui - Qt::GuiPrivate - Qt::WaylandCompositor - Qt::WaylandCompositorPrivate -) - -qt6_generate_wayland_protocol_server_sources(QWaylandXCompositeGlxClientBufferIntegrationPlugin - FILES - ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/compositor/xcomposite_share/../../../3rdparty/protocol/wayland.xml - ${CMAKE_CURRENT_SOURCE_DIR}/../../../../hardwareintegration/compositor/xcomposite_share/../../../extensions/xcomposite.xml -) - -#### Keys ignored in scope 1:.:.:xcomposite-glx.pro:<TRUE>: -# OTHER_FILES = "xcomposite-glx.json" diff --git a/src/plugins/hardwareintegration/compositor/xcomposite-glx/main.cpp b/src/plugins/hardwareintegration/compositor/xcomposite-glx/main.cpp deleted file mode 100644 index b33ee6b9b..000000000 --- a/src/plugins/hardwareintegration/compositor/xcomposite-glx/main.cpp +++ /dev/null @@ -1,52 +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:GPL$ -** 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 General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 or (at your option) 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.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-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include <QtWaylandCompositor/private/qwlclientbufferintegrationplugin_p.h> -#include "xcompositeglxintegration.h" - -QT_BEGIN_NAMESPACE - -class QWaylandXCompositeGlxClientBufferIntegrationPlugin : public QtWayland::ClientBufferIntegrationPlugin -{ - Q_OBJECT - Q_PLUGIN_METADATA(IID QtWaylandClientBufferIntegrationFactoryInterface_iid FILE "xcomposite-glx.json") -public: - QtWayland::ClientBufferIntegration *create(const QString&, const QStringList&) override; -}; - -QtWayland::ClientBufferIntegration *QWaylandXCompositeGlxClientBufferIntegrationPlugin::create(const QString& system, const QStringList& paramList) -{ - Q_UNUSED(paramList); - Q_UNUSED(system); - return new XCompositeGLXClientBufferIntegration(); -} - -QT_END_NAMESPACE - -#include "main.moc" diff --git a/src/plugins/hardwareintegration/compositor/xcomposite-glx/xcomposite-glx.json b/src/plugins/hardwareintegration/compositor/xcomposite-glx/xcomposite-glx.json deleted file mode 100644 index e2c4cecd6..000000000 --- a/src/plugins/hardwareintegration/compositor/xcomposite-glx/xcomposite-glx.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "Keys": [ "xcomposite-glx" ] -} diff --git a/src/plugins/hardwareintegration/compositor/xcomposite-glx/xcomposite-glx.pro b/src/plugins/hardwareintegration/compositor/xcomposite-glx/xcomposite-glx.pro deleted file mode 100644 index 41e5c2ec5..000000000 --- a/src/plugins/hardwareintegration/compositor/xcomposite-glx/xcomposite-glx.pro +++ /dev/null @@ -1,14 +0,0 @@ -QT += waylandcompositor waylandcompositor-private core-private gui-private - -OTHER_FILES += xcomposite-glx.json - -SOURCES += \ - main.cpp - -TARGET = qt-wayland-compositor-xcomposite-glx - -include(../../../../hardwareintegration/compositor/xcomposite-glx/xcomposite-glx.pri) - -PLUGIN_TYPE = wayland-graphics-integration-server -PLUGIN_CLASS_NAME = QWaylandXCompositeGlxClientBufferIntegrationPlugin -load(qt_plugin) |