From 6102ab8d646d76a68bb460885394501e90b4fd1f Mon Sep 17 00:00:00 2001 From: Donald Carr Date: Wed, 2 May 2012 00:44:45 +0000 Subject: Make eglfs hooks functionality namespace cognisant Change-Id: Ie9f86bd0494c0423f50d0f405922ab169b2431e3 Reviewed-by: Girish Ramakrishnan --- mkspecs/devices/linux-arm-amlogic-8726M-g++/qeglfshooks_8726m.cpp | 3 +++ .../linux-mipsel-broadcom-97425-g++/qdirectfbeglhooks_bcm97425.cpp | 3 +++ mkspecs/devices/linux-rasp-pi-g++/qeglfshooks_pi.cpp | 4 ++++ 3 files changed, 10 insertions(+) (limited to 'mkspecs') diff --git a/mkspecs/devices/linux-arm-amlogic-8726M-g++/qeglfshooks_8726m.cpp b/mkspecs/devices/linux-arm-amlogic-8726M-g++/qeglfshooks_8726m.cpp index 6655c50573..9fa05a4bf4 100644 --- a/mkspecs/devices/linux-arm-amlogic-8726M-g++/qeglfshooks_8726m.cpp +++ b/mkspecs/devices/linux-arm-amlogic-8726M-g++/qeglfshooks_8726m.cpp @@ -48,6 +48,8 @@ #include #include +QT_BEGIN_NAMESPACE + class QEglFS8726MHooks : public QEglFSHooks { public: @@ -90,3 +92,4 @@ void QEglFS8726MHooks::destroyNativeWindow(EGLNativeWindowType window) QEglFS8726MHooks eglFS8726MHooks; QEglFSHooks *platformHooks = &eglFS8726MHooks; +QT_END_NAMESPACE diff --git a/mkspecs/devices/linux-mipsel-broadcom-97425-g++/qdirectfbeglhooks_bcm97425.cpp b/mkspecs/devices/linux-mipsel-broadcom-97425-g++/qdirectfbeglhooks_bcm97425.cpp index 16aee0c4f7..07967f762d 100644 --- a/mkspecs/devices/linux-mipsel-broadcom-97425-g++/qdirectfbeglhooks_bcm97425.cpp +++ b/mkspecs/devices/linux-mipsel-broadcom-97425-g++/qdirectfbeglhooks_bcm97425.cpp @@ -44,6 +44,8 @@ #include "default_directfb.h" +QT_BEGIN_NAMESPACE + // Exported to the directfb plugin QDirectFBEGLHooks platform_hook; static void *dbpl_handle; @@ -69,3 +71,4 @@ bool QDirectFBEGLHooks::hasCapability(QPlatformIntegration::Capability cap) cons } } +QT_END_NAMESPACE diff --git a/mkspecs/devices/linux-rasp-pi-g++/qeglfshooks_pi.cpp b/mkspecs/devices/linux-rasp-pi-g++/qeglfshooks_pi.cpp index 21052a5b63..cdd01dc3fa 100644 --- a/mkspecs/devices/linux-rasp-pi-g++/qeglfshooks_pi.cpp +++ b/mkspecs/devices/linux-rasp-pi-g++/qeglfshooks_pi.cpp @@ -52,6 +52,8 @@ #include #endif +QT_BEGIN_NAMESPACE + static DISPMANX_DISPLAY_HANDLE_T dispman_display = 0; static DISPMANX_UPDATE_HANDLE_T dispman_update = 0; @@ -167,3 +169,5 @@ bool QEglFSPiHooks::hasCapability(QPlatformIntegration::Capability cap) const QEglFSPiHooks eglFSPiHooks; QEglFSHooks *platformHooks = &eglFSPiHooks; + +QT_END_NAMESPACE -- cgit v1.2.3