diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-24 03:03:15 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-24 03:03:15 +0200 |
| commit | fc6ee24ac1bf94ca99b6629f00d047131d424e87 (patch) | |
| tree | b55885d34dc9ba49c880467ec823dd4674a6733e /src/compositor/extensions/qwaylandxdgshellv6.cpp | |
| parent | 7fa3a9c2f181323513733ceaac196579730be600 (diff) | |
| parent | da371debb1bcc4a22c5157b0d8a2e09a7cb7ce1b (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I3bbf053a35ceee52d9953a676bacec2b9299bad5
Diffstat (limited to 'src/compositor/extensions/qwaylandxdgshellv6.cpp')
| -rw-r--r-- | src/compositor/extensions/qwaylandxdgshellv6.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compositor/extensions/qwaylandxdgshellv6.cpp b/src/compositor/extensions/qwaylandxdgshellv6.cpp index 96d6f5509..934dccb06 100644 --- a/src/compositor/extensions/qwaylandxdgshellv6.cpp +++ b/src/compositor/extensions/qwaylandxdgshellv6.cpp @@ -37,7 +37,7 @@ #include "qwaylandxdgshellv6.h" #include "qwaylandxdgshellv6_p.h" -#ifdef QT_WAYLAND_COMPOSITOR_QUICK +#if QT_CONFIG(wayland_compositor_quick) #include "qwaylandxdgshellv6integration_p.h" #endif #include <QtWaylandCompositor/private/qwaylandutils_p.h> @@ -698,7 +698,7 @@ QWaylandXdgSurfaceV6 *QWaylandXdgSurfaceV6::fromResource(wl_resource *resource) return nullptr; } -#ifdef QT_WAYLAND_COMPOSITOR_QUICK +#if QT_CONFIG(wayland_compositor_quick) QWaylandQuickShellIntegration *QWaylandXdgSurfaceV6::createIntegration(QWaylandQuickShellSurfaceItem *item) { Q_D(const QWaylandXdgSurfaceV6); |