diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-17 03:07:15 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-17 03:07:15 +0200 |
| commit | 17b291fbd7d07295249edbfbe4d0b7b6dfd41eb2 (patch) | |
| tree | e2566d6ab70fae77f03689be2a00be4e55ba7f73 /src/compositor/extensions/qwaylandxdgshellv5.h | |
| parent | c22329ed2f1e6b3e66a7dae6a8fbc344a1331ce6 (diff) | |
| parent | 2a3ade8cfc0dbfd27def1bca10b0a119331b4ff9 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I1fdf822938737aebe0c13a2eba9e478ba8f8ba14
Diffstat (limited to 'src/compositor/extensions/qwaylandxdgshellv5.h')
| -rw-r--r-- | src/compositor/extensions/qwaylandxdgshellv5.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compositor/extensions/qwaylandxdgshellv5.h b/src/compositor/extensions/qwaylandxdgshellv5.h index f989d04c7..66e9ceb05 100644 --- a/src/compositor/extensions/qwaylandxdgshellv5.h +++ b/src/compositor/extensions/qwaylandxdgshellv5.h @@ -171,7 +171,7 @@ public: Q_INVOKABLE uint sendFullscreen(const QSize &size); Q_INVOKABLE uint sendResizing(const QSize &maxSize); -#ifdef QT_WAYLAND_COMPOSITOR_QUICK +#if QT_CONFIG(wayland_compositor_quick) QWaylandQuickShellIntegration *createIntegration(QWaylandQuickShellSurfaceItem *item) override; #endif @@ -243,7 +243,7 @@ public: Q_INVOKABLE void sendPopupDone(); -#ifdef QT_WAYLAND_COMPOSITOR_QUICK +#if QT_CONFIG(wayland_compositor_quick) QWaylandQuickShellIntegration *createIntegration(QWaylandQuickShellSurfaceItem *item) override; #endif |