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/qwaylandivisurface.h | |
parent | 7fa3a9c2f181323513733ceaac196579730be600 (diff) | |
parent | da371debb1bcc4a22c5157b0d8a2e09a7cb7ce1b (diff) |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I3bbf053a35ceee52d9953a676bacec2b9299bad5
Diffstat (limited to 'src/compositor/extensions/qwaylandivisurface.h')
-rw-r--r-- | src/compositor/extensions/qwaylandivisurface.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compositor/extensions/qwaylandivisurface.h b/src/compositor/extensions/qwaylandivisurface.h index 65d5bbc86..525ad9571 100644 --- a/src/compositor/extensions/qwaylandivisurface.h +++ b/src/compositor/extensions/qwaylandivisurface.h @@ -78,7 +78,7 @@ public: Q_INVOKABLE void sendConfigure(const QSize &size); -#ifdef QT_WAYLAND_COMPOSITOR_QUICK +#if QT_CONFIG(wayland_compositor_quick) QWaylandQuickShellIntegration *createIntegration(QWaylandQuickShellSurfaceItem *item) override; #endif |