diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-11-18 11:49:45 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-18 03:18:48 +0100 |
| commit | fc3705cd04fcb3b2e876d606071423be948b98d1 (patch) | |
| tree | 0a647e1e11b69c8af250f18be8a2802af03756ed /src/plugins/platforms/xcb/qglxintegration.cpp | |
| parent | 21942553294dcbc1afca6f575852c237c1da3ff0 (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.cpp')
| -rw-r--r-- | src/plugins/platforms/xcb/qglxintegration.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/platforms/xcb/qglxintegration.cpp b/src/plugins/platforms/xcb/qglxintegration.cpp index 41bceaf406..550a5e4184 100644 --- a/src/plugins/platforms/xcb/qglxintegration.cpp +++ b/src/plugins/platforms/xcb/qglxintegration.cpp @@ -58,6 +58,8 @@ #include <dlfcn.h> #endif +QT_BEGIN_NAMESPACE + QGLXContext::QGLXContext(QXcbScreen *screen, const QSurfaceFormat &format, QPlatformOpenGLContext *share) : QPlatformOpenGLContext() , m_screen(screen) @@ -134,3 +136,5 @@ QSurfaceFormat QGLXContext::format() const { return m_format; } + +QT_END_NAMESPACE |