From b3021c257dd430f4019c31a3eb1d55d929642c76 Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Fri, 15 Jul 2022 11:42:23 +0200 Subject: Adapt module to work with the new syncqt Add dependencies to WaylandCompositor_sync_headers for the qml plugin targets. Add deprecation macros. Fix syncqt warnings. Task-number: QTBUG-87480 Change-Id: I0e169344c9a8186484fbb36f5ec1e03cd38ea19b Reviewed-by: Alexandru Croitor --- src/client/qtwaylandclientglobal.h | 4 ++++ src/compositor/global/qtwaylandcompositorglobal.h | 4 ++++ src/compositor/global/qwaylandquickextension.h | 4 ++++ src/imports/compositor-extensions/iviapplication/CMakeLists.txt | 2 ++ src/imports/compositor-extensions/presentationtime/CMakeLists.txt | 3 +++ src/imports/compositor-extensions/qtshell/CMakeLists.txt | 2 ++ src/imports/compositor-extensions/wlshell/CMakeLists.txt | 2 ++ src/imports/compositor-extensions/xdgshell/CMakeLists.txt | 2 ++ src/imports/texture-sharing-extension/CMakeLists.txt | 1 + src/imports/texture-sharing/CMakeLists.txt | 2 ++ 10 files changed, 26 insertions(+) (limited to 'src') diff --git a/src/client/qtwaylandclientglobal.h b/src/client/qtwaylandclientglobal.h index 0e547529..1582176e 100644 --- a/src/client/qtwaylandclientglobal.h +++ b/src/client/qtwaylandclientglobal.h @@ -4,6 +4,10 @@ #ifndef QWAYLANDCLIENTGLOBAL_H #define QWAYLANDCLIENTGLOBAL_H +#if 0 +#pragma qt_deprecates(qwaylandclientexport.h) +#endif + #include #include #include diff --git a/src/compositor/global/qtwaylandcompositorglobal.h b/src/compositor/global/qtwaylandcompositorglobal.h index 49b7dc63..bd257a23 100644 --- a/src/compositor/global/qtwaylandcompositorglobal.h +++ b/src/compositor/global/qtwaylandcompositorglobal.h @@ -4,6 +4,10 @@ #ifndef QWAYLANDCOMPOSITORGLOBAL_H #define QWAYLANDCOMPOSITORGLOBAL_H +#if 0 +#pragma qt_deprecates(qwaylandexport.h) +#endif + #include #include #include diff --git a/src/compositor/global/qwaylandquickextension.h b/src/compositor/global/qwaylandquickextension.h index ef51fb2e..2338b0d6 100644 --- a/src/compositor/global/qwaylandquickextension.h +++ b/src/compositor/global/qwaylandquickextension.h @@ -4,6 +4,10 @@ #ifndef QWAYLANDQUICKEXTENSION_H #define QWAYLANDQUICKEXTENSION_H +#if 0 +#pragma qt_class(QWaylandQuickExtension) +#endif + #include #include #include diff --git a/src/imports/compositor-extensions/iviapplication/CMakeLists.txt b/src/imports/compositor-extensions/iviapplication/CMakeLists.txt index 57128a18..370b8d8b 100644 --- a/src/imports/compositor-extensions/iviapplication/CMakeLists.txt +++ b/src/imports/compositor-extensions/iviapplication/CMakeLists.txt @@ -24,6 +24,8 @@ qt_internal_add_qml_module(WaylandCompositorIviapplication Qt::WaylandCompositor ) +qt_internal_add_autogen_sync_header_dependencies(WaylandCompositorIviapplication WaylandCompositor) + #### Keys ignored in scope 1:.:.:iviapplication.pro:: # CXX_MODULE = "qml" # QML_IMPORT_VERSION = "$$QT_VERSION" diff --git a/src/imports/compositor-extensions/presentationtime/CMakeLists.txt b/src/imports/compositor-extensions/presentationtime/CMakeLists.txt index b0798f7e..1ae70984 100644 --- a/src/imports/compositor-extensions/presentationtime/CMakeLists.txt +++ b/src/imports/compositor-extensions/presentationtime/CMakeLists.txt @@ -20,3 +20,6 @@ qt_internal_add_qml_module(WaylandCompositorPresentationTime Qt::Gui Qt::WaylandCompositorPrivate ) + +qt_internal_add_autogen_sync_header_dependencies(WaylandCompositorPresentationTime + WaylandCompositor) diff --git a/src/imports/compositor-extensions/qtshell/CMakeLists.txt b/src/imports/compositor-extensions/qtshell/CMakeLists.txt index 165b77fa..9b1372a4 100644 --- a/src/imports/compositor-extensions/qtshell/CMakeLists.txt +++ b/src/imports/compositor-extensions/qtshell/CMakeLists.txt @@ -33,3 +33,5 @@ qt6_generate_wayland_protocol_server_sources(WaylandCompositorQtShell FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../../extensions/qt-shell-unstable-v1.xml ) + +qt_internal_add_autogen_sync_header_dependencies(WaylandCompositorQtShell WaylandCompositor) diff --git a/src/imports/compositor-extensions/wlshell/CMakeLists.txt b/src/imports/compositor-extensions/wlshell/CMakeLists.txt index d3ec0649..62741710 100644 --- a/src/imports/compositor-extensions/wlshell/CMakeLists.txt +++ b/src/imports/compositor-extensions/wlshell/CMakeLists.txt @@ -24,6 +24,8 @@ qt_internal_add_qml_module(WaylandCompositorWLShell Qt::WaylandCompositor ) +qt_internal_add_autogen_sync_header_dependencies(WaylandCompositorWLShell WaylandCompositor) + #### Keys ignored in scope 1:.:.:wlshell.pro:: # CXX_MODULE = "qml" # QML_IMPORT_VERSION = "$$QT_VERSION" diff --git a/src/imports/compositor-extensions/xdgshell/CMakeLists.txt b/src/imports/compositor-extensions/xdgshell/CMakeLists.txt index f9bd170a..99b01011 100644 --- a/src/imports/compositor-extensions/xdgshell/CMakeLists.txt +++ b/src/imports/compositor-extensions/xdgshell/CMakeLists.txt @@ -24,6 +24,8 @@ qt_internal_add_qml_module(WaylandCompositorXdgShell Qt::WaylandCompositor ) +qt_internal_add_autogen_sync_header_dependencies(WaylandCompositorXdgShell WaylandCompositor) + #### Keys ignored in scope 1:.:.:xdgshell.pro:: # CXX_MODULE = "qml" # QML_IMPORT_VERSION = "$$QT_VERSION" diff --git a/src/imports/texture-sharing-extension/CMakeLists.txt b/src/imports/texture-sharing-extension/CMakeLists.txt index 36ce0771..7d483381 100644 --- a/src/imports/texture-sharing-extension/CMakeLists.txt +++ b/src/imports/texture-sharing-extension/CMakeLists.txt @@ -29,6 +29,7 @@ qt_internal_add_qml_module(WaylandTextureSharingExtension Qt::WaylandCompositorPrivate ) +qt_internal_add_autogen_sync_header_dependencies(WaylandTextureSharingExtension WaylandCompositor) #### Keys ignored in scope 1:.:.:texture-sharing-extension.pro:: # CXX_MODULE = "qml" # IMPORT_VERSION = "1.$$QT_MINOR_VERSION" diff --git a/src/imports/texture-sharing/CMakeLists.txt b/src/imports/texture-sharing/CMakeLists.txt index 5023dc41..f8bdb7f2 100644 --- a/src/imports/texture-sharing/CMakeLists.txt +++ b/src/imports/texture-sharing/CMakeLists.txt @@ -39,6 +39,8 @@ qt6_generate_wayland_protocol_client_sources(WaylandTextureSharing ${CMAKE_CURRENT_SOURCE_DIR}/../../extensions/qt-texture-sharing-unstable-v1.xml ) +qt_internal_add_autogen_sync_header_dependencies(WaylandTextureSharing WaylandCompositor) + #### Keys ignored in scope 1:.:.:texture-sharing.pro:: # CXX_MODULE = "qml" # IMPORT_VERSION = "1.$$QT_MINOR_VERSION" -- cgit v1.2.1