diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-09-27 14:30:08 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-09-27 15:10:13 +0200 |
| commit | ef69b4d772304efcc3b9141900f4e76642d4873b (patch) | |
| tree | be32cebe5d78f424fba33808966982312998a277 /examples | |
| parent | 064feb4fd76e6adbfcafe449d6ae7f52834c538a (diff) | |
| parent | ffee1b3fb8c8e76d9317547376c8f13b0e17b494 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
src/client/qwaylandwindow.cpp
src/client/qwaylandwindow_p.h
src/compositor/compositor_api/qwaylandpointer.cpp
Change-Id: Icbc22a1ae3cdd9cde438742817d07fccf97f647b
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/wayland/server-buffer/compositor/sharebufferextension.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/examples/wayland/server-buffer/compositor/sharebufferextension.h b/examples/wayland/server-buffer/compositor/sharebufferextension.h index 18f6264ff..f84d9c4df 100644 --- a/examples/wayland/server-buffer/compositor/sharebufferextension.h +++ b/examples/wayland/server-buffer/compositor/sharebufferextension.h @@ -64,6 +64,8 @@ #include "qwayland-server-share-buffer.h" +QT_BEGIN_NAMESPACE + namespace QtWayland { class ServerBufferIntegration; @@ -93,4 +95,6 @@ private: Q_COMPOSITOR_DECLARE_QUICK_EXTENSION_CLASS(ShareBufferExtension) +QT_END_NAMESPACE + #endif // SHAREBUFFEREXTENSION_H |