diff --git a/src/plugins/platforms/wayland/CMakeLists.txt b/src/plugins/platforms/wayland/CMakeLists.txt index 577450439b4..a3a153ce4de 100644 --- a/src/plugins/platforms/wayland/CMakeLists.txt +++ b/src/plugins/platforms/wayland/CMakeLists.txt @@ -95,6 +95,19 @@ qt_internal_add_module(WaylandClient ../3rdparty/protocol/wlr-data-control ) +qt_internal_add_plugin(QWaylandIntegrationPlugin + OUTPUT_NAME qwayland + PLUGIN_TYPE platforms + DEFAULT_IF "wayland" IN_LIST QT_QPA_PLATFORMS + SOURCES + main.cpp + LIBRARIES + Qt::Core + Qt::Gui + Qt::WaylandClientPrivate + QT_LICENSE_ID QT_COMMERCIAL_OR_LGPL3 +) + qt6_generate_wayland_protocol_client_sources(WaylandClient PRIVATE_CODE FILES diff --git a/src/plugins/platforms/wayland/plugins/platform/main.cpp b/src/plugins/platforms/wayland/main.cpp similarity index 97% rename from src/plugins/platforms/wayland/plugins/platform/main.cpp rename to src/plugins/platforms/wayland/main.cpp index 19a8fa147f9..1d7edf0ca65 100644 --- a/src/plugins/platforms/wayland/plugins/platform/main.cpp +++ b/src/plugins/platforms/wayland/main.cpp @@ -12,7 +12,7 @@ namespace QtWaylandClient { class QWaylandIntegrationPlugin : public QPlatformIntegrationPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid FILE "qwayland-generic.json") + Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid FILE "qwayland.json") public: QPlatformIntegration *create(const QString&, const QStringList&) override; }; diff --git a/src/plugins/platforms/wayland/plugins/CMakeLists.txt b/src/plugins/platforms/wayland/plugins/CMakeLists.txt index 7b90c829453..09852e64c99 100644 --- a/src/plugins/platforms/wayland/plugins/CMakeLists.txt +++ b/src/plugins/platforms/wayland/plugins/CMakeLists.txt @@ -5,7 +5,6 @@ add_subdirectory(hardwareintegration) if(TARGET Qt::WaylandClient) - add_subdirectory(platform) add_subdirectory(decorations) add_subdirectory(shellintegration) endif() diff --git a/src/plugins/platforms/wayland/plugins/platform/CMakeLists.txt b/src/plugins/platforms/wayland/plugins/platform/CMakeLists.txt deleted file mode 100644 index 59b6b3efead..00000000000 --- a/src/plugins/platforms/wayland/plugins/platform/CMakeLists.txt +++ /dev/null @@ -1,24 +0,0 @@ -# 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 - PLUGIN_TYPE platforms - DEFAULT_IF "wayland" IN_LIST QT_QPA_PLATFORMS - SOURCES - main.cpp - LIBRARIES - Qt::Core - Qt::Gui - Qt::WaylandClientPrivate - QT_LICENSE_ID QT_COMMERCIAL_OR_LGPL3 -) - -#### Keys ignored in scope 1:.:.:qwayland-generic.pro:: -# OTHER_FILES = "qwayland-generic.json" diff --git a/src/plugins/platforms/wayland/plugins/platform/qwayland-generic.json b/src/plugins/platforms/wayland/qwayland.json similarity index 100% rename from src/plugins/platforms/wayland/plugins/platform/qwayland-generic.json rename to src/plugins/platforms/wayland/qwayland.json