diff options
| author | Mårten Nordheim <marten.nordheim@qt.io> | 2019-05-14 20:15:48 +0200 |
|---|---|---|
| committer | Mårten Nordheim <marten.nordheim@qt.io> | 2019-05-15 10:58:49 +0000 |
| commit | 2544cfe80f4fca9d34c02336f051cfc215506cbc (patch) | |
| tree | 7faec9febcdc9b8dfe8500b7ea6124d5489654b4 /src/openglextensions/qopenglextensions.h | |
| parent | 95e136380262fd159c305f7d51824126aeaa757e (diff) | |
Move forward-declaration inside of namespace
Including both qopenglextensions.h and qopenglcontext.h would cause
ambiguity for the compiler when using QOpenGLContext
Change-Id: If8e46741c86d7639f442b5ac05a4493da784eb2f
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Diffstat (limited to 'src/openglextensions/qopenglextensions.h')
| -rw-r--r-- | src/openglextensions/qopenglextensions.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/openglextensions/qopenglextensions.h b/src/openglextensions/qopenglextensions.h index 59dbdd4f12..439e0e6530 100644 --- a/src/openglextensions/qopenglextensions.h +++ b/src/openglextensions/qopenglextensions.h @@ -66,10 +66,10 @@ #include <QtGui/qopengl.h> -class QOpenGLContext; - QT_BEGIN_NAMESPACE +class QOpenGLContext; + #if 0 // silence syncqt warnings #pragma qt_class(QOpenGLExtensions) |