diff options
Diffstat (limited to 'src/gui')
-rw-r--r-- | src/gui/accessible/qaccessible.h | 2 | ||||
-rw-r--r-- | src/gui/image/qiconloader_p.h | 2 | ||||
-rw-r--r-- | src/gui/kernel/qopenglcontext.h | 2 | ||||
-rw-r--r-- | src/gui/kernel/qplatformopenglcontext.h | 3 | ||||
-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 | ||||
-rw-r--r-- | src/gui/text/qtextodfwriter_p.h | 3 | ||||
-rw-r--r-- | src/gui/text/qzipreader_p.h | 2 | ||||
-rw-r--r-- | src/gui/text/qzipwriter_p.h | 3 |
14 files changed, 30 insertions, 4 deletions
diff --git a/src/gui/accessible/qaccessible.h b/src/gui/accessible/qaccessible.h index 96fc7c031b..09e259c1d0 100644 --- a/src/gui/accessible/qaccessible.h +++ b/src/gui/accessible/qaccessible.h @@ -39,6 +39,8 @@ ** ****************************************************************************/ +#include <QtCore/qglobal.h> + #ifndef QT_NO_ACCESSIBILITY #ifndef QACCESSIBLE_H #define QACCESSIBLE_H diff --git a/src/gui/image/qiconloader_p.h b/src/gui/image/qiconloader_p.h index ea144ec299..419d93d576 100644 --- a/src/gui/image/qiconloader_p.h +++ b/src/gui/image/qiconloader_p.h @@ -42,6 +42,8 @@ #ifndef QICONLOADER_P_H #define QICONLOADER_P_H +#include <QtCore/qglobal.h> + #ifndef QT_NO_ICON // // W A R N I N G diff --git a/src/gui/kernel/qopenglcontext.h b/src/gui/kernel/qopenglcontext.h index 52b4a2da28..419fd541eb 100644 --- a/src/gui/kernel/qopenglcontext.h +++ b/src/gui/kernel/qopenglcontext.h @@ -42,6 +42,8 @@ #ifndef QOPENGLCONTEXT_H #define QOPENGLCONTEXT_H +#include <QtCore/qglobal.h> + #ifndef QT_NO_OPENGL #include <QtCore/qnamespace.h> diff --git a/src/gui/kernel/qplatformopenglcontext.h b/src/gui/kernel/qplatformopenglcontext.h index 9e13622283..42e4db2f9d 100644 --- a/src/gui/kernel/qplatformopenglcontext.h +++ b/src/gui/kernel/qplatformopenglcontext.h @@ -51,9 +51,10 @@ // source and binary incompatible with future versions of Qt. // +#include <QtCore/qnamespace.h> + #ifndef QT_NO_OPENGL -#include <QtCore/qnamespace.h> #include <QtGui/qsurfaceformat.h> #include <QtGui/qwindow.h> #include <QtGui/qopengl.h> 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> diff --git a/src/gui/text/qtextodfwriter_p.h b/src/gui/text/qtextodfwriter_p.h index cbdc5fbb95..6683e1eed9 100644 --- a/src/gui/text/qtextodfwriter_p.h +++ b/src/gui/text/qtextodfwriter_p.h @@ -41,6 +41,9 @@ #ifndef QTEXTODFWRITER_H #define QTEXTODFWRITER_H + +#include <QtCore/qglobal.h> + #ifndef QT_NO_TEXTODFWRITER // diff --git a/src/gui/text/qzipreader_p.h b/src/gui/text/qzipreader_p.h index a784d7d9ea..b641689e47 100644 --- a/src/gui/text/qzipreader_p.h +++ b/src/gui/text/qzipreader_p.h @@ -42,6 +42,8 @@ #ifndef QZIPREADER_H #define QZIPREADER_H +#include <QtCore/qglobal.h> + #ifndef QT_NO_TEXTODFWRITER // diff --git a/src/gui/text/qzipwriter_p.h b/src/gui/text/qzipwriter_p.h index 1246da5a05..e6a19e22e4 100644 --- a/src/gui/text/qzipwriter_p.h +++ b/src/gui/text/qzipwriter_p.h @@ -40,6 +40,9 @@ ****************************************************************************/ #ifndef QZIPWRITER_H #define QZIPWRITER_H + +#include <QtCore/qglobal.h> + #ifndef QT_NO_TEXTODFWRITER // |