diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2022-12-02 16:33:08 +0100 |
|---|---|---|
| committer | Alexey Edelev <alexey.edelev@qt.io> | 2022-12-08 15:35:37 +0100 |
| commit | 4b415fbfa6dd1090a12c00b1c8c2c9a9412b2c32 (patch) | |
| tree | d99d2932cbf74153464669ddde4d23bdd919d806 | |
| parent | 7367762dc45a5276f3b2b772f894245c8d8fed10 (diff) | |
| download | qtapplicationmanager-4b415fbfa6dd1090a12c00b1c8c2c9a9412b2c32.tar.gz | |
Adjust module to work with syncqt.cpp
Add interface dependencies to fix top-level builds. Add
PRIVATE_HEADER_FILTERS for the generated wayland code.
Task-number: QTBUG-87480
Change-Id: I6f35777786bf4356cd8cd2c31709601a08407912
Reviewed-by: Robert Griebl <robert.griebl@qt.io>
| -rw-r--r-- | src/launcher-lib/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/manager-lib/inprocesssurfaceitem.h | 4 | ||||
| -rw-r--r-- | src/window-lib/CMakeLists.txt | 4 |
3 files changed, 12 insertions, 0 deletions
diff --git a/src/launcher-lib/CMakeLists.txt b/src/launcher-lib/CMakeLists.txt index 1d293725..87f1c3ef 100644 --- a/src/launcher-lib/CMakeLists.txt +++ b/src/launcher-lib/CMakeLists.txt @@ -31,6 +31,8 @@ qt_internal_add_module(AppManLauncherPrivate Qt::QuickPrivate DEFINES AM_COMPILING_APPMAN + PRIVATE_HEADER_FILTERS + "^qwayland-.*\.h|^wayland-.*-protocol\.h" ) qt_internal_extend_target(AppManLauncherPrivate CONDITION QT_FEATURE_am_widgets_support AND TARGET Qt::Widgets @@ -44,6 +46,8 @@ if(TARGET Qt::WaylandClient) FILES ${CMAKE_CURRENT_SOURCE_DIR}/../wayland-extensions/qtam-extension.xml ) + + qt_internal_add_autogen_sync_header_dependencies(AppManLauncherPrivate WaylandClient) endif() qt_internal_extend_target(AppManLauncherPrivate CONDITION TARGET Qt::WaylandClient diff --git a/src/manager-lib/inprocesssurfaceitem.h b/src/manager-lib/inprocesssurfaceitem.h index c0e0fa49..6600dd8d 100644 --- a/src/manager-lib/inprocesssurfaceitem.h +++ b/src/manager-lib/inprocesssurfaceitem.h @@ -5,6 +5,10 @@ #pragma once +#if 0 +#pragma qt_sync_skip_header_check +#endif + #include <QColor> #include <QPointer> #include <private/qquickfocusscope_p.h> diff --git a/src/window-lib/CMakeLists.txt b/src/window-lib/CMakeLists.txt index ab60bf26..2bf391f2 100644 --- a/src/window-lib/CMakeLists.txt +++ b/src/window-lib/CMakeLists.txt @@ -26,6 +26,8 @@ qt_internal_add_module(AppManWindowPrivate Qt::Quick DEFINES AM_COMPILING_APPMAN + PRIVATE_HEADER_FILTERS + "^qwayland-.*\.h|^wayland-.*-protocol\.h" ) if(QT_FEATURE_am_multi_process) @@ -45,4 +47,6 @@ if(QT_FEATURE_am_multi_process) PUBLIC_LIBRARIES Qt::WaylandCompositor ) + + qt_internal_add_autogen_sync_header_dependencies(AppManWindowPrivate WaylandCompositor) endif() |