summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/xcb/qglxintegration.h
diff options
context:
space:
mode:
authorRohan McGovern <rohan.mcgovern@nokia.com>2011-11-18 11:49:45 +1000
committerQt by Nokia <qt-info@nokia.com>2011-11-18 03:18:48 +0100
commitfc3705cd04fcb3b2e876d606071423be948b98d1 (patch)
tree0a647e1e11b69c8af250f18be8a2802af03756ed /src/plugins/platforms/xcb/qglxintegration.h
parent21942553294dcbc1afca6f575852c237c1da3ff0 (diff)
Fixed crashes from tests using xcb plugin with -qtnamespace.
Use QT_BEGIN_NAMESPACE/QT_END_NAMESPACE consistently in xcb plugin. Some, but not all, of the sources were already using QT_BEGIN_NAMESPACE. Change-Id: I23b83cc88870fd4039437b733084ab86dd807356 Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
Diffstat (limited to 'src/plugins/platforms/xcb/qglxintegration.h')
-rw-r--r--src/plugins/platforms/xcb/qglxintegration.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/platforms/xcb/qglxintegration.h b/src/plugins/platforms/xcb/qglxintegration.h
index bbe67b653a..2c8fea5874 100644
--- a/src/plugins/platforms/xcb/qglxintegration.h
+++ b/src/plugins/platforms/xcb/qglxintegration.h
@@ -52,6 +52,8 @@
#include <GL/glx.h>
+QT_BEGIN_NAMESPACE
+
class QGLXContext : public QPlatformOpenGLContext
{
public:
@@ -73,4 +75,6 @@ private:
QSurfaceFormat m_format;
};
+QT_END_NAMESPACE
+
#endif