diff options
author | Ilya Fedin <fedin-ilja2010@ya.ru> | 2022-01-14 07:44:58 +0400 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2022-01-18 18:04:41 +0000 |
commit | c04b8d178621b5c7c75d717ef18f76f918890e06 (patch) | |
tree | 720bb1ea4897baf9256903ce2ef497a25e14c54d /src/compositor/extensions | |
parent | 2dc725c57bb12a99f141b3852f6db516ced1661b (diff) | |
download | qtwayland-c04b8d178621b5c7c75d717ef18f76f918890e06.tar.gz |
Fix WaylandCompositor PCH build without qtdeclarative
Currently, quick-related headers included in the module header
conditionlessly what makes it fail with PCH when Qt is built without
qtdeclarative.
Fixes: QTBUG-97593
Pick-to: 6.2 6.3
Change-Id: Ida73f3369982594aae9e14160f6966fe57c7e089
Reviewed-by: Liang Qi <liang.qi@qt.io>
Diffstat (limited to 'src/compositor/extensions')
3 files changed, 6 insertions, 0 deletions
diff --git a/src/compositor/extensions/qwaylandquickshellintegration.h b/src/compositor/extensions/qwaylandquickshellintegration.h index cae11ee4..1fbbf67e 100644 --- a/src/compositor/extensions/qwaylandquickshellintegration.h +++ b/src/compositor/extensions/qwaylandquickshellintegration.h @@ -33,6 +33,8 @@ #include <QtCore/QObject> #include <QtWaylandCompositor/qtwaylandcompositorglobal.h> +QT_REQUIRE_CONFIG(wayland_compositor_quick); + QT_BEGIN_NAMESPACE class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandQuickShellIntegration : public QObject diff --git a/src/compositor/extensions/qwaylandquickshellsurfaceitem.h b/src/compositor/extensions/qwaylandquickshellsurfaceitem.h index d2cc311a..24905299 100644 --- a/src/compositor/extensions/qwaylandquickshellsurfaceitem.h +++ b/src/compositor/extensions/qwaylandquickshellsurfaceitem.h @@ -33,6 +33,8 @@ #include <QtWaylandCompositor/QWaylandCompositorExtension> #include <QtWaylandCompositor/QWaylandQuickItem> +QT_REQUIRE_CONFIG(wayland_compositor_quick); + QT_BEGIN_NAMESPACE class QWaylandQuickShellSurfaceItemPrivate; diff --git a/src/compositor/extensions/qwaylandquickxdgoutputv1.h b/src/compositor/extensions/qwaylandquickxdgoutputv1.h index d6701cc8..0c682fa5 100644 --- a/src/compositor/extensions/qwaylandquickxdgoutputv1.h +++ b/src/compositor/extensions/qwaylandquickxdgoutputv1.h @@ -34,6 +34,8 @@ #include <QtQml/QQmlParserStatus> #include <QtWaylandCompositor/QWaylandXdgOutputV1> +QT_REQUIRE_CONFIG(wayland_compositor_quick); + QT_BEGIN_NAMESPACE class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandQuickXdgOutputV1 |