diff options
Diffstat (limited to 'src')
37 files changed, 77 insertions, 5 deletions
diff --git a/src/corelib/io/qiodevice.h b/src/corelib/io/qiodevice.h index 39c2d70492c..cdc90f21bb5 100644 --- a/src/corelib/io/qiodevice.h +++ b/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 diff --git a/src/corelib/kernel/qfunctions_nacl.h b/src/corelib/kernel/qfunctions_nacl.h index f40807a0d9b..c15b9756d07 100644 --- a/src/corelib/kernel/qfunctions_nacl.h +++ b/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> diff --git a/src/corelib/kernel/qfunctions_vxworks.h b/src/corelib/kernel/qfunctions_vxworks.h index 02c599f4905..e33401a86a6 100644 --- a/src/corelib/kernel/qfunctions_vxworks.h +++ b/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> diff --git a/src/corelib/kernel/qfunctions_wince.h b/src/corelib/kernel/qfunctions_wince.h index 4eeb9cff6af..ab7bbe3f997 100644 --- a/src/corelib/kernel/qfunctions_wince.h +++ b/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> diff --git a/src/corelib/kernel/qtimer.h b/src/corelib/kernel/qtimer.h index 34bfff90894..3484f4dba8c 100644 --- a/src/corelib/kernel/qtimer.h +++ b/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 diff --git a/src/corelib/tools/qregexp.h b/src/corelib/tools/qregexp.h index acf59d71968..26b0b78317e 100644 --- a/src/corelib/tools/qregexp.h +++ b/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> diff --git a/src/corelib/tools/qregularexpression.h b/src/corelib/tools/qregularexpression.h index 97dbee92565..5059ea64319 100644 --- a/src/corelib/tools/qregularexpression.h +++ b/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> diff --git a/src/gui/accessible/qaccessible.h b/src/gui/accessible/qaccessible.h index 96fc7c031b3..09e259c1d0a 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 ea144ec2993..419d93d5768 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 52b4a2da287..419fd541ebe 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 9e13622283a..42e4db2f9d3 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 c5bff90d2a9..6e8be66806f 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 014060086d4..ab564e9001e 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 e4fd7c8e953..215d3701ca8 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 7d88f8b08be..1548ad4a248 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 5868a5740a8..c05571c9288 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 6c3dd37843d..b894ae3af81 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 474a5d5d1f5..b58a7186d17 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 cbdc5fbb95a..6683e1eed93 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 a784d7d9eaa..b641689e479 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 1246da5a054..e6a19e22e47 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 // diff --git a/src/openglextensions/qopenglextensions.h b/src/openglextensions/qopenglextensions.h index 0e9e2c60d49..7d6c21e4e5d 100644 --- a/src/openglextensions/qopenglextensions.h +++ b/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; diff --git a/src/platformsupport/fontdatabases/genericunix/qgenericunixfontdatabase_p.h b/src/platformsupport/fontdatabases/genericunix/qgenericunixfontdatabase_p.h index 1995ead657f..a8a0b8fe9c5 100644 --- a/src/platformsupport/fontdatabases/genericunix/qgenericunixfontdatabase_p.h +++ b/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; diff --git a/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.h b/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.h index 7ebe7a4e9d4..3b1fbe042dc 100644 --- a/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.h +++ b/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> diff --git a/src/plugins/platforms/cocoa/qcocoasystemtrayicon.h b/src/plugins/platforms/cocoa/qcocoasystemtrayicon.h index 89ab51cf05e..61a6ba3e2f4 100755 --- a/src/plugins/platforms/cocoa/qcocoasystemtrayicon.h +++ b/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" diff --git a/src/plugins/platforms/cocoa/qprintengine_mac_p.h b/src/plugins/platforms/cocoa/qprintengine_mac_p.h index fd1b60a9ad6..28183118d84 100644 --- a/src/plugins/platforms/cocoa/qprintengine_mac_p.h +++ b/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> diff --git a/src/plugins/platforms/qnx/qqnxclipboard.h b/src/plugins/platforms/qnx/qqnxclipboard.h index 0b75393efdc..e069355adc3 100644 --- a/src/plugins/platforms/qnx/qqnxclipboard.h +++ b/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> diff --git a/src/plugins/platforms/windows/qwindowsfontenginedirectwrite.h b/src/plugins/platforms/windows/qwindowsfontenginedirectwrite.h index 35ed6f3891d..106087f7579 100644 --- a/src/plugins/platforms/windows/qwindowsfontenginedirectwrite.h +++ b/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> diff --git a/src/printsupport/kernel/qpaintengine_alpha_p.h b/src/printsupport/kernel/qpaintengine_alpha_p.h index 99b9b930e9a..8a0781d0d38 100644 --- a/src/printsupport/kernel/qpaintengine_alpha_p.h +++ b/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> diff --git a/src/printsupport/kernel/qprintengine_win_p.h b/src/printsupport/kernel/qprintengine_win_p.h index ffeebb07045..93fe9930883 100644 --- a/src/printsupport/kernel/qprintengine_win_p.h +++ b/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> diff --git a/src/sql/drivers/db2/qsql_db2_p.h b/src/sql/drivers/db2/qsql_db2_p.h index 6a5363740b4..68563448edb 100644 --- a/src/sql/drivers/db2/qsql_db2_p.h +++ b/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 diff --git a/src/testlib/qtestaccessible.h b/src/testlib/qtestaccessible.h index 24fc1d79910..f27651c3ad3 100644 --- a/src/testlib/qtestaccessible.h +++ b/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) \ diff --git a/src/widgets/dialogs/qfiledialog_p.h b/src/widgets/dialogs/qfiledialog_p.h index ffaa2bc6f88..4292df58909 100644 --- a/src/widgets/dialogs/qfiledialog_p.h +++ b/src/widgets/dialogs/qfiledialog_p.h @@ -53,6 +53,8 @@ // We mean it. // +#include <QtCore/qglobal.h> + #ifndef QT_NO_FILEDIALOG #include "qfiledialog.h" diff --git a/src/widgets/dialogs/qwizard_win_p.h b/src/widgets/dialogs/qwizard_win_p.h index badaab52d9c..542f59e1b25 100644 --- a/src/widgets/dialogs/qwizard_win_p.h +++ b/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 diff --git a/src/widgets/kernel/qwidgetsfunctions_wince.h b/src/widgets/kernel/qwidgetsfunctions_wince.h index cc8c1e4a033..ca742e296a1 100644 --- a/src/widgets/kernel/qwidgetsfunctions_wince.h +++ b/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> diff --git a/src/widgets/styles/qcommonstylepixmaps_p.h b/src/widgets/styles/qcommonstylepixmaps_p.h index 0699ff89144..20607ccd60d 100644 --- a/src/widgets/styles/qcommonstylepixmaps_p.h +++ b/src/widgets/styles/qcommonstylepixmaps_p.h @@ -39,6 +39,8 @@ ** ****************************************************************************/ +#include <QtCore/qglobal.h> + #ifndef QT_NO_IMAGEFORMAT_XPM // diff --git a/src/widgets/widgets/qscrollarea_p.h b/src/widgets/widgets/qscrollarea_p.h index ee38221877a..c5c00d34515 100644 --- a/src/widgets/widgets/qscrollarea_p.h +++ b/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" |