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/hardwareintegration | |
| parent | d107e2ba88e44590f77c608073eee6429f3d3a8c (diff) | |
Fix namespaced build
Change-Id: Id73f8ddffe00359f38c634fc88b1f81ac5638653
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'src/hardwareintegration')
| -rw-r--r-- | src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.h | 3 | ||||
| -rw-r--r-- | src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxintegration.h | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.h b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.h index cce0e91bf..ff6ac51cc 100644 --- a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.h +++ b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.h @@ -65,6 +65,7 @@ #endif struct qt_xcomposite; +struct qt_xcomposite_listener; QT_BEGIN_NAMESPACE @@ -101,7 +102,7 @@ private: static void wlDisplayHandleGlobal(void *data, struct wl_registry *registry, uint32_t id, const QString &interface, uint32_t version); - static const struct qt_xcomposite_listener xcomposite_listener; + static const struct ::qt_xcomposite_listener xcomposite_listener; static void rootInformation(void *data, struct qt_xcomposite *xcomposite, const char *display_name, diff --git a/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxintegration.h b/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxintegration.h index 1751f775f..638b27741 100644 --- a/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxintegration.h +++ b/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxintegration.h @@ -60,6 +60,7 @@ #endif struct qt_xcomposite; +struct qt_xcomposite_listener; QT_BEGIN_NAMESPACE |