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>

src/corelib/io/qiodevice.h

@@ -42,6 +42,7 @@
 #ifndef QIODEVICE_H
 #define QIODEVICE_H
 
+#include <QtCore/qglobal.h>
 #ifndef QT_NO_QOBJECT
 #include <QtCore/qobject.h>
 #else

src/corelib/kernel/qfunctions_nacl.h

@@ -42,6 +42,8 @@
 #ifndef QFUNCTIONS_NACL_H
 #define QFUNCTIONS_NACL_H
 
+#include <QtCore/qglobal.h>
+
 #ifdef Q_OS_NACL
 
 #include <sys/types.h>

src/corelib/kernel/qfunctions_vxworks.h

@@ -41,6 +41,9 @@
 
 #ifndef QFUNCTIONS_VXWORKS_H
 #define QFUNCTIONS_VXWORKS_H
+
+#include <QtCore/qglobal.h>
+
 #ifdef Q_OS_VXWORKS
 
 #include <unistd.h>

src/corelib/kernel/qfunctions_wince.h

@@ -41,6 +41,9 @@
 
 #ifndef QFUNCTIONS_WINCE_H
 #define QFUNCTIONS_WINCE_H
+
+#include <QtCore/qglobal.h>
+
 #ifdef Q_OS_WINCE
 #include <stdio.h>
 #include <stdlib.h>

src/corelib/kernel/qtimer.h

@@ -42,6 +42,8 @@
 #ifndef QTIMER_H
 #define QTIMER_H
 
+#include <QtCore/qglobal.h>
+
 #ifndef QT_NO_QOBJECT
 
 #include <QtCore/qbasictimer.h> // conceptual inheritance

src/corelib/tools/qregexp.h

@@ -42,6 +42,8 @@
 #ifndef QREGEXP_H
 #define QREGEXP_H
 
+#include <QtCore/qglobal.h>
+
 #ifndef QT_NO_REGEXP
 
 #include <QtCore/qstring.h>

src/corelib/tools/qregularexpression.h

@@ -43,6 +43,8 @@
 #ifndef QREGULAREXPRESSION_H
 #define QREGULAREXPRESSION_H
 
+#include <QtCore/qglobal.h>
+
 #ifndef QT_NO_REGULAREXPRESSION
 
 #include <QtCore/qstring.h>

src/gui/accessible/qaccessible.h

@@ -39,6 +39,8 @@
 **
 ****************************************************************************/
 
+#include <QtCore/qglobal.h>
+
 #ifndef QT_NO_ACCESSIBILITY
 #ifndef QACCESSIBLE_H
 #define QACCESSIBLE_H

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

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>

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>

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>

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>

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>

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__

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>

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>

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>

src/gui/text/qtextodfwriter_p.h

@@ -41,6 +41,9 @@
 
 #ifndef QTEXTODFWRITER_H
 #define QTEXTODFWRITER_H
+
+#include <QtCore/qglobal.h>
+
 #ifndef QT_NO_TEXTODFWRITER
 
 //

src/gui/text/qzipreader_p.h

@@ -42,6 +42,8 @@
 #ifndef QZIPREADER_H
 #define QZIPREADER_H
 
+#include <QtCore/qglobal.h>
+
 #ifndef QT_NO_TEXTODFWRITER
 
 //

src/gui/text/qzipwriter_p.h

@@ -40,6 +40,9 @@
 ****************************************************************************/
 #ifndef QZIPWRITER_H
 #define QZIPWRITER_H
+
+#include <QtCore/qglobal.h>
+
 #ifndef QT_NO_TEXTODFWRITER
 
 //

src/openglextensions/qopenglextensions.h

@@ -51,9 +51,10 @@
 #ifndef QOPENGLEXTENSIONS_H
 #define QOPENGLEXTENSIONS_H
 
+#include <QtCore/qglobal.h>
+
 #ifndef QT_NO_OPENGL
 
-#include <QtCore/QtGlobal>
 #include <QtGui/qopengl.h>
 
 class QOpenGLContext;

src/platformsupport/fontdatabases/genericunix/qgenericunixfontdatabase_p.h

@@ -42,6 +42,8 @@
 #ifndef QGENERICUNIXFONTDATABASE_H
 #define QGENERICUNIXFONTDATABASE_H
 
+#include <QtCore/qglobal.h>
+
 #ifdef Q_FONTCONFIGDATABASE
 #include <QtPlatformSupport/private/qfontconfigdatabase_p.h>
 typedef QFontconfigDatabase QGenericUnixFontDatabase;

src/plugins/platforms/cocoa/qcocoaaccessibilityelement.h

@@ -41,6 +41,7 @@
 #ifndef QCOCOAACCESIBILITYELEMENT_H
 #define QCOCOAACCESIBILITYELEMENT_H
 
+#include <QtCore/qglobal.h>
 
 #import <Cocoa/Cocoa.h>
 #import <AppKit/NSAccessibility.h>

src/plugins/platforms/cocoa/qcocoasystemtrayicon.h

@@ -43,6 +43,8 @@
 #ifndef QCOCOASYSTEMTRAYICON_P_H
 #define QCOCOASYSTEMTRAYICON_P_H
 
+#include <QtCore/qglobal.h>
+
 #ifndef QT_NO_SYSTEMTRAYICON
 
 #include "QtCore/qstring.h"

src/plugins/platforms/cocoa/qprintengine_mac_p.h

@@ -53,6 +53,8 @@
 // We mean it.
 //
 
+#include <QtCore/qglobal.h>
+
 #ifndef QT_NO_PRINTER
 
 #include <QtPrintSupport/qprinter.h>

src/plugins/platforms/qnx/qqnxclipboard.h

@@ -42,6 +42,8 @@
 #ifndef QQNXCLIPBOARD_H
 #define QQNXCLIPBOARD_H
 
+#include <QtCore/qglobal.h>
+
 #ifndef QT_NO_CLIPBOARD
 #include <qpa/qplatformclipboard.h>
 

src/plugins/platforms/windows/qwindowsfontenginedirectwrite.h

@@ -42,6 +42,8 @@
 #ifndef QWINDOWSFONTENGINEDIRECTWRITE_H
 #define QWINDOWSFONTENGINEDIRECTWRITE_H
 
+#include <QtCore/qglobal.h>
+
 #ifndef QT_NO_DIRECTWRITE
 
 #include <QtGui/private/qfontengine_p.h>

src/printsupport/kernel/qpaintengine_alpha_p.h

@@ -53,6 +53,8 @@
 // We mean it.
 //
 
+#include <QtCore/qglobal.h>
+
 #ifndef QT_NO_PRINTER
 #include "private/qpaintengine_p.h"
 #include <QtPrintSupport/qtprintsupportglobal.h>

src/printsupport/kernel/qprintengine_win_p.h

@@ -53,6 +53,8 @@
 // We mean it.
 //
 
+#include <QtCore/qglobal.h>
+
 #ifndef QT_NO_PRINTER
 
 #include <QtGui/qpaintengine.h>

src/sql/drivers/db2/qsql_db2_p.h

@@ -53,6 +53,8 @@
 // We mean it.
 //
 
+#include <QtCore/qglobal.h>
+
 #ifdef QT_PLUGIN
 #define Q_EXPORT_SQLDRIVER_DB2
 #else

src/testlib/qtestaccessible.h

@@ -47,6 +47,8 @@
 #pragma qt_no_master_include
 #endif
 
+#include <QtCore/qglobal.h>
+
 #ifndef QT_NO_ACCESSIBILITY
 
 #define QVERIFY_EVENT(event) \

src/widgets/dialogs/qfiledialog_p.h

@@ -53,6 +53,8 @@
 // We mean it.
 //
 
+#include <QtCore/qglobal.h>
+
 #ifndef QT_NO_FILEDIALOG
 
 #include "qfiledialog.h"

src/widgets/dialogs/qwizard_win_p.h

@@ -53,6 +53,8 @@
 // We mean it.
 //
 
+#include <QtCore/qglobal.h>
+
 #ifndef QT_NO_WIZARD
 #ifndef QT_NO_STYLE_WINDOWSVISTA
 

src/widgets/kernel/qwidgetsfunctions_wince.h

@@ -40,6 +40,9 @@
 ****************************************************************************/
 #ifndef QWIDGETSFUNCTIONS_WCE_H
 #define QWIDGETSFUNCTIONS_WCE_H
+
+#include <QtCore/qglobal.h>
+
 #ifdef Q_OS_WINCE
 #include <QtCore/qfunctions_wince.h>
 

src/widgets/styles/qcommonstylepixmaps_p.h

@@ -39,6 +39,8 @@
 **
 ****************************************************************************/
 
+#include <QtCore/qglobal.h>
+
 #ifndef QT_NO_IMAGEFORMAT_XPM
 
 //

src/widgets/widgets/qscrollarea_p.h

@@ -53,6 +53,8 @@
 // We mean it.
 //
 
+#include <QtCore/qglobal.h>
+
 #ifndef QT_NO_SCROLLAREA
 
 #include "private/qabstractscrollarea_p.h"