diff options
| author | Giulio Camuffo <giulio.camuffo@jollamobile.com> | 2014-08-07 17:24:11 +0300 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-08-07 19:17:57 +0200 |
| commit | a7edcb7c8d710367ab7a9deddf22fbc6ab8f59a3 (patch) | |
| tree | dbabc9c473f5d0a0f644730a6b6f03ef4ceb2be6 /src/compositor/wayland_wrapper | |
| parent | d107e2ba88e44590f77c608073eee6429f3d3a8c (diff) | |
Fix namespaced build
Change-Id: Id73f8ddffe00359f38c634fc88b1f81ac5638653
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'src/compositor/wayland_wrapper')
| -rw-r--r-- | src/compositor/wayland_wrapper/qwlcompositor_p.h | 2 | ||||
| -rw-r--r-- | src/compositor/wayland_wrapper/qwlkeyboard.cpp | 4 | ||||
| -rw-r--r-- | src/compositor/wayland_wrapper/qwlpointer.cpp | 4 | ||||
| -rw-r--r-- | src/compositor/wayland_wrapper/qwltouch.cpp | 4 |
4 files changed, 13 insertions, 1 deletions
diff --git a/src/compositor/wayland_wrapper/qwlcompositor_p.h b/src/compositor/wayland_wrapper/qwlcompositor_p.h index 922c7f102..599f79b6d 100644 --- a/src/compositor/wayland_wrapper/qwlcompositor_p.h +++ b/src/compositor/wayland_wrapper/qwlcompositor_p.h @@ -217,7 +217,7 @@ protected: bool m_retainSelection; - friend class ::QWaylandCompositor; + friend class QT_PREPEND_NAMESPACE(QWaylandCompositor); }; } diff --git a/src/compositor/wayland_wrapper/qwlkeyboard.cpp b/src/compositor/wayland_wrapper/qwlkeyboard.cpp index 2642480f5..67ad3b727 100644 --- a/src/compositor/wayland_wrapper/qwlkeyboard.cpp +++ b/src/compositor/wayland_wrapper/qwlkeyboard.cpp @@ -54,6 +54,8 @@ #include <sys/types.h> #endif +QT_BEGIN_NAMESPACE + namespace QtWayland { Keyboard::Keyboard(Compositor *compositor, InputDevice *seat) @@ -355,3 +357,5 @@ void Keyboard::createXKBKeymap() #endif } // namespace QtWayland + +QT_END_NAMESPACE diff --git a/src/compositor/wayland_wrapper/qwlpointer.cpp b/src/compositor/wayland_wrapper/qwlpointer.cpp index 4c3cc3b41..4363ed0f4 100644 --- a/src/compositor/wayland_wrapper/qwlpointer.cpp +++ b/src/compositor/wayland_wrapper/qwlpointer.cpp @@ -48,6 +48,8 @@ #include "qwaylandcompositor.h" #include "qwaylandsurfaceview.h" +QT_BEGIN_NAMESPACE + namespace QtWayland { using QtWaylandServer::wl_keyboard; @@ -325,3 +327,5 @@ PointerGrabber::~PointerGrabber() } } // namespace QtWayland + +QT_END_NAMESPACE diff --git a/src/compositor/wayland_wrapper/qwltouch.cpp b/src/compositor/wayland_wrapper/qwltouch.cpp index 8824cd09c..85f065b59 100644 --- a/src/compositor/wayland_wrapper/qwltouch.cpp +++ b/src/compositor/wayland_wrapper/qwltouch.cpp @@ -45,6 +45,8 @@ #include "qwlsurface_p.h" #include "qwaylandsurfaceview.h" +QT_BEGIN_NAMESPACE + namespace QtWayland { Touch::Touch(Compositor *compositor) @@ -170,3 +172,5 @@ void TouchGrabber::setTouch(Touch *touch) } } // namespace QtWayland + +QT_END_NAMESPACE |