diff options
| author | Andy Nichols <andy.nichols@digia.com> | 2013-09-09 13:58:40 +0200 |
|---|---|---|
| committer | Andy Nichols <andy.nichols@digia.com> | 2013-09-09 13:58:40 +0200 |
| commit | 82b7f6faed8961acc07ff6ee56236d001000f149 (patch) | |
| tree | 75d9acd9aba89b927021196d7be8922ad83bece1 /src/plugins/platforms/wayland_common/qwaylanddataoffer.cpp | |
| parent | aa0584194b5fe3dd01830dbaed231dabfa6d455d (diff) | |
| parent | 330c429991ef1c32ffdd51cdc8627ef1b71604b3 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
qtwayland.pro
src/plugins/platforms/wayland_common/qwaylandshellsurface.cpp
src/plugins/platforms/wayland_common/qwaylandshellsurface.h
src/plugins/platforms/wayland_common/qwaylandwindow.cpp
src/plugins/platforms/wayland_common/qwaylandwindow.h
Change-Id: Ifa9bc553d826b893b054bbaef5ea3fc3013de3df
Diffstat (limited to 'src/plugins/platforms/wayland_common/qwaylanddataoffer.cpp')
| -rw-r--r-- | src/plugins/platforms/wayland_common/qwaylanddataoffer.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/platforms/wayland_common/qwaylanddataoffer.cpp b/src/plugins/platforms/wayland_common/qwaylanddataoffer.cpp index d2080ea55..d98cfc2ab 100644 --- a/src/plugins/platforms/wayland_common/qwaylanddataoffer.cpp +++ b/src/plugins/platforms/wayland_common/qwaylanddataoffer.cpp @@ -47,7 +47,7 @@ #include <QtCore/QDebug> -QT_USE_NAMESPACE +QT_BEGIN_NAMESPACE void QWaylandDataOffer::offer_sync_callback(void *data, struct wl_callback *callback, @@ -143,3 +143,5 @@ struct wl_data_offer *QWaylandDataOffer::handle() const { return m_data_offer; } + +QT_END_NAMESPACE |