diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2013-03-10 13:34:52 -0700 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-19 07:02:57 +0100 |
| commit | d1b4857d1718ef50dba64c8700253fed5d187ab2 (patch) | |
| tree | bbf5dd9904bd1f0188929d57279dd7d8bc8b3470 /src/gui/opengl | |
| parent | a1bc48422fc898496fe9e7e75f0ed74522cd18bc (diff) | |
Make sure that we #include qconfig.h before testing for features.
This is mandatory in public headers (qiodevice.h, qopengl*, etc.), but
it's a good idea even in private headers, in case someone includes
that header first somewhere. In particular, all platformsupport API is
private.
Change-Id: If287baa5d9ed14e93c1666efa0e6332c4c1cd9a4
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'src/gui/opengl')
| -rw-r--r-- | src/gui/opengl/qopengl.h | 4 | ||||
| -rw-r--r-- | src/gui/opengl/qopenglbuffer.h | 2 | ||||
| -rw-r--r-- | src/gui/opengl/qopenglframebufferobject.h | 2 | ||||
| -rw-r--r-- | src/gui/opengl/qopenglfunctions.h | 2 | ||||
| -rw-r--r-- | src/gui/opengl/qopenglpaintdevice.h | 2 | ||||
| -rw-r--r-- | src/gui/opengl/qopenglshaderprogram.h | 2 | ||||
| -rw-r--r-- | src/gui/opengl/qopenglversionfunctions.h | 3 |
7 files changed, 14 insertions, 3 deletions
diff --git a/src/gui/opengl/qopengl.h b/src/gui/opengl/qopengl.h index c5bff90d2a..6e8be66806 100644 --- a/src/gui/opengl/qopengl.h +++ b/src/gui/opengl/qopengl.h @@ -42,10 +42,10 @@ #ifndef QOPENGL_H #define QOPENGL_H -#ifndef QT_NO_OPENGL - #include <QtCore/qglobal.h> +#ifndef QT_NO_OPENGL + // Windows always needs this to ensure that APIENTRY gets defined #if defined(Q_OS_WIN) # include <QtCore/qt_windows.h> diff --git a/src/gui/opengl/qopenglbuffer.h b/src/gui/opengl/qopenglbuffer.h index 014060086d..ab564e9001 100644 --- a/src/gui/opengl/qopenglbuffer.h +++ b/src/gui/opengl/qopenglbuffer.h @@ -42,6 +42,8 @@ #ifndef QOPENGLBUFFER_H #define QOPENGLBUFFER_H +#include <QtCore/qglobal.h> + #ifndef QT_NO_OPENGL #include <QtCore/qscopedpointer.h> diff --git a/src/gui/opengl/qopenglframebufferobject.h b/src/gui/opengl/qopenglframebufferobject.h index e4fd7c8e95..215d3701ca 100644 --- a/src/gui/opengl/qopenglframebufferobject.h +++ b/src/gui/opengl/qopenglframebufferobject.h @@ -42,6 +42,8 @@ #ifndef QOPENGLFRAMEBUFFEROBJECT_H #define QOPENGLFRAMEBUFFEROBJECT_H +#include <QtCore/qglobal.h> + #ifndef QT_NO_OPENGL #include <QtGui/qopengl.h> diff --git a/src/gui/opengl/qopenglfunctions.h b/src/gui/opengl/qopenglfunctions.h index 7d88f8b08b..1548ad4a24 100644 --- a/src/gui/opengl/qopenglfunctions.h +++ b/src/gui/opengl/qopenglfunctions.h @@ -42,6 +42,8 @@ #ifndef QOPENGLFUNCTIONS_H #define QOPENGLFUNCTIONS_H +#include <QtCore/qglobal.h> + #ifndef QT_NO_OPENGL #ifdef __GLEW_H__ diff --git a/src/gui/opengl/qopenglpaintdevice.h b/src/gui/opengl/qopenglpaintdevice.h index 5868a5740a..c05571c928 100644 --- a/src/gui/opengl/qopenglpaintdevice.h +++ b/src/gui/opengl/qopenglpaintdevice.h @@ -42,6 +42,8 @@ #ifndef QOPENGLPAINTDEVICE_H #define QOPENGLPAINTDEVICE_H +#include <QtCore/qglobal.h> + #ifndef QT_NO_OPENGL #include <QtGui/qpaintdevice.h> diff --git a/src/gui/opengl/qopenglshaderprogram.h b/src/gui/opengl/qopenglshaderprogram.h index 6c3dd37843..b894ae3af8 100644 --- a/src/gui/opengl/qopenglshaderprogram.h +++ b/src/gui/opengl/qopenglshaderprogram.h @@ -42,6 +42,8 @@ #ifndef QOPENGLSHADERPROGRAM_H #define QOPENGLSHADERPROGRAM_H +#include <QtCore/qglobal.h> + #ifndef QT_NO_OPENGL #include <QtGui/qopengl.h> diff --git a/src/gui/opengl/qopenglversionfunctions.h b/src/gui/opengl/qopenglversionfunctions.h index 474a5d5d1f..b58a7186d1 100644 --- a/src/gui/opengl/qopenglversionfunctions.h +++ b/src/gui/opengl/qopenglversionfunctions.h @@ -51,9 +51,10 @@ #ifndef QOPENGLVERSIONFUNCTIONS_H #define QOPENGLVERSIONFUNCTIONS_H +#include <QtCore/qglobal.h> + #ifndef QT_NO_OPENGL -#include <QtCore/QtGlobal> #include <QtCore/qhash.h> #include <QtCore/qpair.h> #include <QtGui/qopengl.h> |