diff options
author | Giulio Camuffo <giulio.camuffo@jollamobile.com> | 2015-01-29 14:35:44 +0200 |
---|---|---|
committer | Giulio Camuffo <giulio.camuffo@jollamobile.com> | 2015-01-29 12:53:04 +0000 |
commit | e6255beec9114afd1fad9e7d62ebec433a627d54 (patch) | |
tree | e03655b01f480e4e82686ad02318f241a21f0002 /src/client/qwaylanddatadevice_p.h | |
parent | 1db1fa1619e718eebdc88899df6c0a8c6d2309b9 (diff) |
Namespace the platform plugins
There currently is a QWaylandInputDevice class both in the wayland QPA
plugin and in the QtCompositor API. This causes the qwindow-compositor
example to crash when running nested in a wayland session due to a
mismatch between the two classes.
By namespacing all the plugin code we make sure that name clashes
will not happen anymore.
Change-Id: I17497cff697599200bea68bf01dfde474526390f
Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com>
Diffstat (limited to 'src/client/qwaylanddatadevice_p.h')
-rw-r--r-- | src/client/qwaylanddatadevice_p.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/client/qwaylanddatadevice_p.h b/src/client/qwaylanddatadevice_p.h index ef82d84dd..a80312c94 100644 --- a/src/client/qwaylanddatadevice_p.h +++ b/src/client/qwaylanddatadevice_p.h @@ -48,12 +48,15 @@ QT_BEGIN_NAMESPACE -class QWaylandDisplay; class QMimeData; +class QWindow; + +namespace QtWaylandClient { + +class QWaylandDisplay; class QWaylandDataDeviceManager; class QWaylandDataOffer; class QWaylandDataSource; -class QWindow; class QWaylandInputDevice; class QWaylandWindow; @@ -99,6 +102,8 @@ private: QScopedPointer<QWaylandDataSource> m_dragSource; }; +} + QT_END_NAMESPACE #endif // QWAYLANDDATADEVICE_H |