Add qtguiglobal.h and qtguiglobal_p.h

The new modular configuration system requires one global header per module, that is included by all other files in this module. A similar scheme and naming convention is already being used for many other modules (e.g. printsupport, qml, quick). That header will later on #include the configuration file for Qt Gui. For now it defines the Q_GUI_EXPORT macro for this library. In addition, add a private global header, qtguiglobal_p.h, that can later on include the private config header for Qt Gui for things we don't want to export to the world. Change-Id: Id9ce2a4f3d2962c3592c35e3d080574789195f24 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2016-06-22 09:53:38 +02:00 · 2016-06-22 09:53:38 +02:00 · e8fe65205c
commit e8fe65205c
parent 5fa3e2a82e
285 changed files with 408 additions and 99 deletions
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@ -296,11 +296,6 @@ typedef double qreal;
 #  else
 #    define Q_CORE_EXPORT Q_DECL_IMPORT
 #  endif
-#  if defined(QT_BUILD_GUI_LIB)
-#    define Q_GUI_EXPORT Q_DECL_EXPORT
-#  else
-#    define Q_GUI_EXPORT Q_DECL_IMPORT
-#  endif
 #  if defined(QT_BUILD_WIDGETS_LIB)
 #    define Q_WIDGETS_EXPORT Q_DECL_EXPORT
 #  else
@ -313,7 +308,6 @@ typedef double qreal;
 #  endif
 #else
 #  define Q_CORE_EXPORT
-#  define Q_GUI_EXPORT
 #  define Q_WIDGETS_EXPORT
 #  define Q_NETWORK_EXPORT
 #endif
--- a/src/gui/accessible/qaccessible.h
+++ b/src/gui/accessible/qaccessible.h
@ -37,7 +37,7 @@
 **
 ****************************************************************************/

-#include <QtCore/qglobal.h>
+#include <QtGui/qtguiglobal.h>

 #ifndef QT_NO_ACCESSIBILITY
 #ifndef QACCESSIBLE_H
--- a/src/gui/accessible/qaccessiblebridge.h
+++ b/src/gui/accessible/qaccessiblebridge.h
@ -40,6 +40,7 @@
 #ifndef QACCESSIBLEBRIDGE_H
 #define QACCESSIBLEBRIDGE_H

+#include <QtGui/qtguiglobal.h>
 #include <QtCore/qplugin.h>
 #include <QtCore/qfactoryinterface.h>

--- a/src/gui/accessible/qaccessiblecache_p.h
+++ b/src/gui/accessible/qaccessiblecache_p.h
@ -51,7 +51,7 @@
 // We mean it.
 //

-#include <QtCore/qglobal.h>
+#include <QtGui/private/qtguiglobal_p.h>
 #include <QtCore/qobject.h>
 #include <QtCore/qhash.h>

--- a/src/gui/accessible/qaccessibleobject.h
+++ b/src/gui/accessible/qaccessibleobject.h
@ -40,6 +40,7 @@
 #ifndef QACCESSIBLEOBJECT_H
 #define QACCESSIBLEOBJECT_H

+#include <QtGui/qtguiglobal.h>
 #include <QtGui/qaccessible.h>

 QT_BEGIN_NAMESPACE
--- a/src/gui/accessible/qaccessibleplugin.h
+++ b/src/gui/accessible/qaccessibleplugin.h
@ -40,6 +40,7 @@
 #ifndef QACCESSIBLEPLUGIN_H
 #define QACCESSIBLEPLUGIN_H

+#include <QtGui/qtguiglobal.h>
 #include <QtGui/qaccessible.h>
 #include <QtCore/qfactoryinterface.h>

--- a/src/gui/accessible/qplatformaccessibility.h
+++ b/src/gui/accessible/qplatformaccessibility.h
@ -48,9 +48,11 @@
 // source and binary incompatible with future versions of Qt.
 //

-#include <QtCore/qobject.h>
+#include <QtGui/qtguiglobal.h>
+
 #ifndef QT_NO_ACCESSIBILITY

+#include <QtCore/qobject.h>
 #include <QtGui/qaccessible.h>

 QT_BEGIN_NAMESPACE
--- a/src/gui/animation/qguivariantanimation.cpp
+++ b/src/gui/animation/qguivariantanimation.cpp
@ -36,11 +36,12 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include <QtCore/qvariantanimation.h>
-#include <private/qvariantanimation_p.h>
+#include <QtGui/qtguiglobal.h>

 #ifndef QT_NO_ANIMATION

+#include <QtCore/qvariantanimation.h>
+#include <private/qvariantanimation_p.h>
 #include <QtGui/qcolor.h>
 #include <QtGui/qvector2d.h>
 #include <QtGui/qvector3d.h>
--- a/src/gui/image/qbitmap.h
+++ b/src/gui/image/qbitmap.h
@ -40,6 +40,7 @@
 #ifndef QBITMAP_H
 #define QBITMAP_H

+#include <QtGui/qtguiglobal.h>
 #include <QtGui/qpixmap.h>

 QT_BEGIN_NAMESPACE
--- a/src/gui/image/qbmphandler_p.h
+++ b/src/gui/image/qbmphandler_p.h
@ -51,6 +51,7 @@
 // We mean it.
 //

+#include <QtGui/private/qtguiglobal_p.h>
 #include "QtGui/qimageiohandler.h"

 #ifndef QT_NO_IMAGEFORMAT_BMP
--- a/src/gui/image/qicon.h
+++ b/src/gui/image/qicon.h
@ -40,7 +40,7 @@
 #ifndef QICON_H
 #define QICON_H

-#include <QtCore/qglobal.h>
+#include <QtGui/qtguiglobal.h>
 #include <QtCore/qsize.h>
 #include <QtCore/qlist.h>
 #include <QtGui/qpixmap.h>
--- a/src/gui/image/qicon_p.h
+++ b/src/gui/image/qicon_p.h
@ -51,7 +51,7 @@
 // We mean it.
 //

-#include <QtCore/qglobal.h>
+#include <QtGui/private/qtguiglobal_p.h>
 #include <QtCore/qsize.h>
 #include <QtCore/qlist.h>
 #include <QtGui/qpixmap.h>
--- a/src/gui/image/qiconengine.h
+++ b/src/gui/image/qiconengine.h
@ -40,7 +40,7 @@
 #ifndef QICONENGINE_H
 #define QICONENGINE_H

-#include <QtCore/qglobal.h>
+#include <QtGui/qtguiglobal.h>
 #include <QtCore/qlist.h>
 #include <QtGui/qicon.h>

--- a/src/gui/image/qiconengineplugin.h
+++ b/src/gui/image/qiconengineplugin.h
@ -40,6 +40,7 @@
 #ifndef QICONENGINEPLUGIN_H
 #define QICONENGINEPLUGIN_H

+#include <QtGui/qtguiglobal.h>
 #include <QtCore/qplugin.h>
 #include <QtCore/qfactoryinterface.h>

--- a/src/gui/image/qiconloader_p.h
+++ b/src/gui/image/qiconloader_p.h
@ -40,7 +40,7 @@
 #ifndef QICONLOADER_P_H
 #define QICONLOADER_P_H

-#include <QtCore/qglobal.h>
+#include <QtGui/private/qtguiglobal_p.h>

 #ifndef QT_NO_ICON
 //
--- a/src/gui/image/qimage.h
+++ b/src/gui/image/qimage.h
@ -40,6 +40,7 @@
 #ifndef QIMAGE_H
 #define QIMAGE_H

+#include <QtGui/qtguiglobal.h>
 #include <QtGui/qcolor.h>
 #include <QtGui/qrgb.h>
 #include <QtGui/qpaintdevice.h>
--- a/src/gui/image/qimage_p.h
+++ b/src/gui/image/qimage_p.h
@ -51,7 +51,7 @@
 // We mean it.
 //

-#include <QtCore/qglobal.h>
+#include <QtGui/private/qtguiglobal_p.h>

 #include <QMap>
 #include <QVector>
--- a/src/gui/image/qimageiohandler.h
+++ b/src/gui/image/qimageiohandler.h
@ -40,6 +40,7 @@
 #ifndef QIMAGEIOHANDLER_H
 #define QIMAGEIOHANDLER_H

+#include <QtGui/qtguiglobal.h>
 #include <QtCore/qiodevice.h>
 #include <QtCore/qplugin.h>
 #include <QtCore/qfactoryinterface.h>
--- a/src/gui/image/qimagepixmapcleanuphooks_p.h
+++ b/src/gui/image/qimagepixmapcleanuphooks_p.h
@ -51,6 +51,7 @@
 // We mean it.
 //

+#include <QtGui/private/qtguiglobal_p.h>
 #include <QtGui/qpixmap.h>

 QT_BEGIN_NAMESPACE
--- a/src/gui/image/qimagereader.h
+++ b/src/gui/image/qimagereader.h
@ -40,6 +40,7 @@
 #ifndef QIMAGEREADER_H
 #define QIMAGEREADER_H

+#include <QtGui/qtguiglobal.h>
 #include <QtCore/qbytearray.h>
 #include <QtCore/qcoreapplication.h>
 #include <QtGui/qimage.h>
--- a/src/gui/image/qimagewriter.h
+++ b/src/gui/image/qimagewriter.h
@ -40,6 +40,7 @@
 #ifndef QIMAGEWRITER_H
 #define QIMAGEWRITER_H

+#include <QtGui/qtguiglobal.h>
 #include <QtCore/qbytearray.h>
 #include <QtCore/qcoreapplication.h>
 #include <QtCore/qlist.h>
--- a/src/gui/image/qmovie.h
+++ b/src/gui/image/qmovie.h
@ -40,10 +40,11 @@
 #ifndef QMOVIE_H
 #define QMOVIE_H

-#include <QtCore/qobject.h>
+#include <QtGui/qtguiglobal.h>

 #ifndef QT_NO_MOVIE

+#include <QtCore/qobject.h>
 #include <QtCore/qbytearray.h>
 #include <QtCore/qlist.h>
 #include <QtGui/qimagereader.h>
--- a/src/gui/image/qnativeimage_p.h
+++ b/src/gui/image/qnativeimage_p.h
@ -51,6 +51,7 @@
 // We mean it.
 //

+#include <QtGui/private/qtguiglobal_p.h>
 #include "qimage.h"


--- a/src/gui/image/qpaintengine_pic_p.h
+++ b/src/gui/image/qpaintengine_pic_p.h
@ -52,7 +52,8 @@
 //
 //

-#include "QtGui/qpaintengine.h"
+#include <QtGui/private/qtguiglobal_p.h>
+#include <QtGui/qpaintengine.h>

 #ifndef QT_NO_PICTURE

--- a/src/gui/image/qpicture.h
+++ b/src/gui/image/qpicture.h
@ -40,6 +40,7 @@
 #ifndef QPICTURE_H
 #define QPICTURE_H

+#include <QtGui/qtguiglobal.h>
 #include <QtCore/qiodevice.h>
 #include <QtCore/qstringlist.h>
 #include <QtCore/qsharedpointer.h>
--- a/src/gui/image/qpicture_p.h
+++ b/src/gui/image/qpicture_p.h
@ -51,6 +51,7 @@
 // We mean it.
 //

+#include <QtGui/private/qtguiglobal_p.h>
 #include "QtCore/qatomic.h"
 #include "QtCore/qbuffer.h"
 #include "QtCore/qobjectdefs.h"
--- a/src/gui/image/qpictureformatplugin.h
+++ b/src/gui/image/qpictureformatplugin.h
@ -40,6 +40,7 @@
 #ifndef QPICTUREFORMATPLUGIN_H
 #define QPICTUREFORMATPLUGIN_H

+#include <QtGui/qtguiglobal.h>
 #include <QtCore/qplugin.h>
 #include <QtCore/qfactoryinterface.h>

--- a/src/gui/image/qpixmap.h
+++ b/src/gui/image/qpixmap.h
@ -40,6 +40,7 @@
 #ifndef QPIXMAP_H
 #define QPIXMAP_H

+#include <QtGui/qtguiglobal.h>
 #include <QtGui/qpaintdevice.h>
 #include <QtGui/qcolor.h>
 #include <QtCore/qnamespace.h>
--- a/src/gui/image/qpixmap_blitter_p.h
+++ b/src/gui/image/qpixmap_blitter_p.h
@ -51,6 +51,7 @@
 // We mean it.
 //

+#include <QtGui/private/qtguiglobal_p.h>
 #include <qpa/qplatformpixmap.h>
 #include <private/qpaintengine_blitter_p.h>

--- a/src/gui/image/qpixmap_raster_p.h
+++ b/src/gui/image/qpixmap_raster_p.h
@ -51,6 +51,7 @@
 // We mean it.
 //

+#include <QtGui/private/qtguiglobal_p.h>
 #include <qpa/qplatformpixmap.h>


--- a/src/gui/image/qpixmapcache.h
+++ b/src/gui/image/qpixmapcache.h
@ -40,6 +40,7 @@
 #ifndef QPIXMAPCACHE_H
 #define QPIXMAPCACHE_H

+#include <QtGui/qtguiglobal.h>
 #include <QtGui/qpixmap.h>

 QT_BEGIN_NAMESPACE
--- a/src/gui/image/qpixmapcache_p.h
+++ b/src/gui/image/qpixmapcache_p.h
@ -50,6 +50,7 @@
 // We mean it.
 //

+#include <QtGui/private/qtguiglobal_p.h>
 #include "qpixmapcache.h"
 #include "qpaintengine.h"
 #include <private/qimage_p.h>
--- a/src/gui/image/qplatformpixmap.h
+++ b/src/gui/image/qplatformpixmap.h
@ -49,6 +49,7 @@
 // source and binary incompatible with future versions of Qt.
 //

+#include <QtGui/qtguiglobal.h>
 #include <QtGui/qpixmap.h>
 #include <QtCore/qatomic.h>

--- a/src/gui/image/qpnghandler_p.h
+++ b/src/gui/image/qpnghandler_p.h
@ -51,6 +51,7 @@
 // We mean it.
 //

+#include <QtGui/private/qtguiglobal_p.h>
 #include "QtGui/qimageiohandler.h"

 #ifndef QT_NO_IMAGEFORMAT_PNG
--- a/src/gui/image/qppmhandler_p.h
+++ b/src/gui/image/qppmhandler_p.h
@ -51,6 +51,7 @@
 // We mean it.
 //

+#include <QtGui/private/qtguiglobal_p.h>
 #include "QtGui/qimageiohandler.h"

 #ifndef QT_NO_IMAGEFORMAT_PPM
--- a/src/gui/image/qxbmhandler_p.h
+++ b/src/gui/image/qxbmhandler_p.h
@ -51,6 +51,7 @@
 // We mean it.
 //

+#include <QtGui/private/qtguiglobal_p.h>
 #include "QtGui/qimageiohandler.h"

 #ifndef QT_NO_IMAGEFORMAT_XBM
--- a/src/gui/image/qxpmhandler_p.h
+++ b/src/gui/image/qxpmhandler_p.h
@ -51,6 +51,7 @@
 // We mean it.
 //

+#include <QtGui/private/qtguiglobal_p.h>
 #include "QtGui/qimageiohandler.h"

 #ifndef QT_NO_IMAGEFORMAT_XPM
--- a/src/gui/itemmodels/qstandarditemmodel.h
+++ b/src/gui/itemmodels/qstandarditemmodel.h
@ -40,6 +40,7 @@
 #ifndef QSTANDARDITEMMODEL_H
 #define QSTANDARDITEMMODEL_H

+#include <QtGui/qtguiglobal.h>
 #include <QtCore/qabstractitemmodel.h>
 #include <QtGui/qbrush.h>
 #include <QtGui/qfont.h>
--- a/src/gui/itemmodels/qstandarditemmodel_p.h
+++ b/src/gui/itemmodels/qstandarditemmodel_p.h
@ -51,6 +51,7 @@
 // We mean it.
 //

+#include <QtGui/private/qtguiglobal_p.h>
 #include "private/qabstractitemmodel_p.h"

 #ifndef QT_NO_STANDARDITEMMODEL
--- a/src/gui/kernel/kernel.pri
+++ b/src/gui/kernel/kernel.pri
@ -6,6 +6,8 @@ PRECOMPILED_HEADER = kernel/qt_gui_pch.h

 KERNEL_P= kernel
 HEADERS += \
+        kernel/qtguiglobal.h \
+        kernel/qtguiglobal_p.h \
        kernel/qgenericpluginfactory.h \
        kernel/qgenericplugin.h \
        kernel/qwindowsysteminterface.h \
--- a/src/gui/kernel/qclipboard.h
+++ b/src/gui/kernel/qclipboard.h
@ -40,6 +40,7 @@
 #ifndef QCLIPBOARD_H
 #define QCLIPBOARD_H

+#include <QtGui/qtguiglobal.h>
 #include <QtCore/qobject.h>

 QT_BEGIN_NAMESPACE
--- a/src/gui/kernel/qcursor.h
+++ b/src/gui/kernel/qcursor.h
@ -40,6 +40,7 @@
 #ifndef QCURSOR_H
 #define QCURSOR_H

+#include <QtGui/qtguiglobal.h>
 #include <QtCore/qpoint.h>
 #include <QtGui/qwindowdefs.h>

--- a/src/gui/kernel/qcursor_p.h
+++ b/src/gui/kernel/qcursor_p.h
@ -51,8 +51,8 @@
 // We mean it.
 //

+#include <QtGui/private/qtguiglobal_p.h>
 #include "QtCore/qatomic.h"
-#include "QtCore/qglobal.h"
 #include "QtCore/qnamespace.h"
 #include "QtGui/qpixmap.h"

--- a/src/gui/kernel/qdnd_p.h
+++ b/src/gui/kernel/qdnd_p.h
@ -51,6 +51,7 @@
 // We mean it.
 //

+#include <QtGui/private/qtguiglobal_p.h>
 #include "QtCore/qobject.h"
 #include "QtCore/qmap.h"
 #include "QtCore/qmimedata.h"
--- a/src/gui/kernel/qdrag.h
+++ b/src/gui/kernel/qdrag.h
@ -40,6 +40,7 @@
 #ifndef QDRAG_H
 #define QDRAG_H

+#include <QtGui/qtguiglobal.h>
 #include <QtCore/qobject.h>

 QT_BEGIN_NAMESPACE
--- a/src/gui/kernel/qevent.h
+++ b/src/gui/kernel/qevent.h
@ -40,6 +40,7 @@
 #ifndef QEVENT_H
 #define QEVENT_H

+#include <QtGui/qtguiglobal.h>
 #include <QtGui/qwindowdefs.h>
 #include <QtGui/qregion.h>
 #include <QtCore/qnamespace.h>
--- a/src/gui/kernel/qevent_p.h
+++ b/src/gui/kernel/qevent_p.h
@ -40,7 +40,7 @@
 #ifndef QEVENT_P_H
 #define QEVENT_P_H

-#include <QtCore/qglobal.h>
+#include <QtGui/private/qtguiglobal_p.h>
 #include <QtCore/qurl.h>
 #include <QtGui/qevent.h>

--- a/src/gui/kernel/qgenericplugin.h
+++ b/src/gui/kernel/qgenericplugin.h
@ -40,6 +40,7 @@
 #ifndef QGENERICPLUGIN_H
 #define QGENERICPLUGIN_H

+#include <QtGui/qtguiglobal.h>
 #include <QtCore/qplugin.h>
 #include <QtCore/qfactoryinterface.h>

--- a/src/gui/kernel/qgenericpluginfactory.h
+++ b/src/gui/kernel/qgenericpluginfactory.h
@ -40,6 +40,7 @@
 #ifndef QGENERICPLUGINFACTORY_H
 #define QGENERICPLUGINFACTORY_H

+#include <QtGui/qtguiglobal.h>
 #include <QtCore/qstringlist.h>

 QT_BEGIN_NAMESPACE
--- a/src/gui/kernel/qguiapplication.h
+++ b/src/gui/kernel/qguiapplication.h
@ -40,6 +40,7 @@
 #ifndef QGUIAPPLICATION_H
 #define QGUIAPPLICATION_H

+#include <QtGui/qtguiglobal.h>
 #include <QtCore/qcoreapplication.h>
 #include <QtGui/qwindowdefs.h>
 #include <QtGui/qinputmethod.h>
--- a/src/gui/kernel/qguiapplication_p.h
+++ b/src/gui/kernel/qguiapplication_p.h
@ -51,6 +51,7 @@
 // We mean it.
 //

+#include <QtGui/private/qtguiglobal_p.h>
 #include <QtGui/qguiapplication.h>

 #include <QtCore/QPointF>
--- a/src/gui/kernel/qhighdpiscaling_p.h
+++ b/src/gui/kernel/qhighdpiscaling_p.h
@ -51,7 +51,7 @@
 // We mean it.
 //

-#include <QtCore/qglobal.h>
+#include <QtGui/private/qtguiglobal_p.h>
 #include <QtCore/qmargins.h>
 #include <QtCore/qmath.h>
 #include <QtCore/qrect.h>
--- a/src/gui/kernel/qinputdevicemanager_p.h
+++ b/src/gui/kernel/qinputdevicemanager_p.h
@ -51,6 +51,7 @@
 // We mean it.
 //

+#include <QtGui/private/qtguiglobal_p.h>
 #include <QtCore/qobject.h>

 QT_BEGIN_NAMESPACE
--- a/src/gui/kernel/qinputdevicemanager_p_p.h
+++ b/src/gui/kernel/qinputdevicemanager_p_p.h
@ -51,6 +51,7 @@
 // We mean it.
 //

+#include <QtGui/private/qtguiglobal_p.h>
 #include <QtCore/qmap.h>
 #include <private/qobject_p.h>
 #include "qinputdevicemanager_p.h"
--- a/src/gui/kernel/qinputmethod.h
+++ b/src/gui/kernel/qinputmethod.h
@ -40,6 +40,7 @@
 #ifndef QINPUTMETHOD_H
 #define QINPUTMETHOD_H

+#include <QtGui/qtguiglobal.h>
 #include <QtCore/qobject.h>

 QT_BEGIN_NAMESPACE
--- a/src/gui/kernel/qinputmethod_p.h
+++ b/src/gui/kernel/qinputmethod_p.h
@ -51,6 +51,7 @@
 // We mean it.
 //

+#include <QtGui/private/qtguiglobal_p.h>
 #include <qinputmethod.h>
 #include <private/qobject_p.h>
 #include <QtCore/QWeakPointer>
--- a/src/gui/kernel/qkeymapper_p.h
+++ b/src/gui/kernel/qkeymapper_p.h
@ -50,6 +50,7 @@
 // We mean it.
 //

+#include <QtGui/private/qtguiglobal_p.h>
 #include <qobject.h>
 #include <private/qobject_p.h>
 #include <qkeysequence.h>
--- a/src/gui/kernel/qkeysequence.h
+++ b/src/gui/kernel/qkeysequence.h
@ -40,7 +40,7 @@
 #ifndef QKEYSEQUENCE_H
 #define QKEYSEQUENCE_H

-#include <QtCore/qnamespace.h>
+#include <QtGui/qtguiglobal.h>
 #include <QtCore/qstring.h>
 #include <QtCore/qobjectdefs.h>

--- a/src/gui/kernel/qkeysequence_p.h
+++ b/src/gui/kernel/qkeysequence_p.h
@ -51,6 +51,7 @@
 // We mean it.
 //

+#include <QtGui/private/qtguiglobal_p.h>
 #include "qkeysequence.h"

 #include <algorithm>
--- a/src/gui/kernel/qoffscreensurface.h
+++ b/src/gui/kernel/qoffscreensurface.h
@ -40,6 +40,7 @@
 #ifndef QOFFSCREENSURFACE_H
 #define QOFFSCREENSURFACE_H

+#include <QtGui/qtguiglobal.h>
 #include <QtCore/QObject>
 #include <QtGui/qsurface.h>

--- a/src/gui/kernel/qopenglcontext.h
+++ b/src/gui/kernel/qopenglcontext.h
@ -40,7 +40,7 @@
 #ifndef QOPENGLCONTEXT_H
 #define QOPENGLCONTEXT_H

-#include <QtCore/qglobal.h>
+#include <QtGui/qtguiglobal.h>

 #ifndef QT_NO_OPENGL

--- a/src/gui/kernel/qopenglcontext_p.h
+++ b/src/gui/kernel/qopenglcontext_p.h
@ -51,6 +51,8 @@
 // We mean it.
 //

+#include <QtGui/private/qtguiglobal_p.h>
+
 #ifndef QT_NO_OPENGL

 #include "qopengl.h"
--- a/src/gui/kernel/qopenglwindow.h
+++ b/src/gui/kernel/qopenglwindow.h
@ -40,7 +40,7 @@
 #ifndef QOPENGLWINDOW_H
 #define QOPENGLWINDOW_H

-#include <QtCore/qglobal.h>
+#include <QtGui/qtguiglobal.h>

 #ifndef QT_NO_OPENGL

--- a/src/gui/kernel/qpaintdevicewindow.h
+++ b/src/gui/kernel/qpaintdevicewindow.h
@ -40,6 +40,7 @@
 #ifndef QPAINTDEVICEWINDOW_H
 #define QPAINTDEVICEWINDOW_H

+#include <QtGui/qtguiglobal.h>
 #include <QtGui/QWindow>
 #include <QtGui/QPaintDevice>

--- a/src/gui/kernel/qpaintdevicewindow_p.h
+++ b/src/gui/kernel/qpaintdevicewindow_p.h
@ -51,6 +51,7 @@
 // We mean it.
 //

+#include <QtGui/private/qtguiglobal_p.h>
 #include <QtGui/QPaintDeviceWindow>
 #include <QtCore/QCoreApplication>
 #include <QtGui/private/qwindow_p.h>
--- a/src/gui/kernel/qpalette.h
+++ b/src/gui/kernel/qpalette.h
@ -40,6 +40,7 @@
 #ifndef QPALETTE_H
 #define QPALETTE_H

+#include <QtGui/qtguiglobal.h>
 #include <QtGui/qwindowdefs.h>
 #include <QtGui/qcolor.h>
 #include <QtGui/qbrush.h>
--- a/src/gui/kernel/qpixelformat.h
+++ b/src/gui/kernel/qpixelformat.h
@ -40,7 +40,7 @@
 #ifndef QPIXELFORMAT_H
 #define QPIXELFORMAT_H

-#include <QtCore/qglobal.h>
+#include <QtGui/qtguiglobal.h>

 QT_BEGIN_NAMESPACE

--- a/src/gui/kernel/qplatformclipboard.h
+++ b/src/gui/kernel/qplatformclipboard.h
@ -49,7 +49,7 @@
 // source and binary incompatible with future versions of Qt.
 //

-#include <QtCore/qglobal.h>
+#include <QtGui/qtguiglobal.h>

 #ifndef QT_NO_CLIPBOARD

--- a/src/gui/kernel/qplatformcursor.h
+++ b/src/gui/kernel/qplatformcursor.h
@ -48,6 +48,7 @@
 // source and binary incompatible with future versions of Qt.
 //

+#include <QtGui/qtguiglobal.h>
 #include <QtCore/QList>
 #include <QtGui/QImage>
 #include <QtGui/QMouseEvent>
--- a/src/gui/kernel/qplatformdialoghelper.h
+++ b/src/gui/kernel/qplatformdialoghelper.h
@ -49,6 +49,7 @@
 // source and binary incompatible with future versions of Qt.
 //

+#include <QtGui/qtguiglobal.h>
 #include <QtCore/QtGlobal>
 #include <QtCore/QObject>
 #include <QtCore/QList>
--- a/src/gui/kernel/qplatformdrag.h
+++ b/src/gui/kernel/qplatformdrag.h
@ -49,7 +49,7 @@
 // source and binary incompatible with future versions of Qt.
 //

-#include <QtCore/qglobal.h>
+#include <QtGui/qtguiglobal.h>
 #include <QtGui/QPixmap>

 QT_BEGIN_NAMESPACE
--- a/src/gui/kernel/qplatformgraphicsbuffer.h
+++ b/src/gui/kernel/qplatformgraphicsbuffer.h
@ -50,6 +50,7 @@
 //


+#include <QtGui/qtguiglobal.h>
 #include <QtCore/QSize>
 #include <QtCore/QRect>
 #include <QtGui/QPixelFormat>
--- a/src/gui/kernel/qplatformgraphicsbufferhelper.h
+++ b/src/gui/kernel/qplatformgraphicsbufferhelper.h
@ -40,6 +40,7 @@
 #ifndef QPLATFORMGRAPHICSBUFFERHELPER_H
 #define QPLATFORMGRAPHICSBUFFERHELPER_H

+#include <QtGui/qtguiglobal.h>
 #include <QtGui/qpa/qplatformgraphicsbuffer.h>

 QT_BEGIN_NAMESPACE
--- a/src/gui/kernel/qplatforminputcontext.h
+++ b/src/gui/kernel/qplatforminputcontext.h
@ -49,6 +49,7 @@
 // source and binary incompatible with future versions of Qt.
 //

+#include <QtGui/qtguiglobal.h>
 #include <QtGui/qinputmethod.h>

 QT_BEGIN_NAMESPACE
--- a/src/gui/kernel/qplatforminputcontext_p.h
+++ b/src/gui/kernel/qplatforminputcontext_p.h
@ -51,6 +51,7 @@
 // We mean it.
 //

+#include <QtGui/private/qtguiglobal_p.h>
 #include <private/qobject_p.h>

 QT_BEGIN_NAMESPACE
--- a/src/gui/kernel/qplatforminputcontextfactory_p.h
+++ b/src/gui/kernel/qplatforminputcontextfactory_p.h
@ -51,6 +51,7 @@
 // We mean it.
 //

+#include <QtGui/private/qtguiglobal_p.h>
 #include <QtCore/qstringlist.h>

 QT_BEGIN_NAMESPACE
--- a/src/gui/kernel/qplatforminputcontextplugin_p.h
+++ b/src/gui/kernel/qplatforminputcontextplugin_p.h
@ -51,6 +51,7 @@
 // We mean it.
 //

+#include <QtGui/private/qtguiglobal_p.h>
 #include <QtCore/qplugin.h>
 #include <QtCore/qfactoryinterface.h>

--- a/src/gui/kernel/qplatformintegration.h
+++ b/src/gui/kernel/qplatformintegration.h
@ -49,6 +49,7 @@
 // source and binary incompatible with future versions of Qt.
 //

+#include <QtGui/qtguiglobal.h>
 #include <QtGui/qwindowdefs.h>
 #include <qpa/qplatformscreen.h>
 #include <QtGui/qsurfaceformat.h>
--- a/src/gui/kernel/qplatformintegrationfactory_p.h
+++ b/src/gui/kernel/qplatformintegrationfactory_p.h
@ -51,6 +51,7 @@
 // We mean it.
 //

+#include <QtGui/private/qtguiglobal_p.h>
 #include <QtCore/qstringlist.h>

 QT_BEGIN_NAMESPACE
--- a/src/gui/kernel/qplatformintegrationplugin.h
+++ b/src/gui/kernel/qplatformintegrationplugin.h
@ -49,6 +49,7 @@
 // source and binary incompatible with future versions of Qt.
 //

+#include <QtGui/qtguiglobal.h>
 #include <QtCore/qplugin.h>
 #include <QtCore/qfactoryinterface.h>

--- a/src/gui/kernel/qplatformmenu.h
+++ b/src/gui/kernel/qplatformmenu.h
@ -49,7 +49,7 @@
 // source and binary incompatible with future versions of Qt.
 //

-#include <QtCore/qglobal.h>
+#include <QtGui/qtguiglobal.h>
 #include <QtCore/qpointer.h>
 #include <QtGui/QFont>
 #include <QtGui/QKeySequence>
--- a/src/gui/kernel/qplatformnativeinterface.h
+++ b/src/gui/kernel/qplatformnativeinterface.h
@ -49,6 +49,7 @@
 // source and binary incompatible with future versions of Qt.
 //

+#include <QtGui/qtguiglobal.h>
 #include <QtGui/qwindowdefs.h>
 #include <QtCore/QObject>
 #include <QtCore/QVariant>
--- a/src/gui/kernel/qplatformoffscreensurface.h
+++ b/src/gui/kernel/qplatformoffscreensurface.h
@ -49,6 +49,7 @@
 // source and binary incompatible with future versions of Qt.
 //

+#include <QtGui/qtguiglobal.h>
 #include "qplatformsurface.h"
 #include <QtCore/qscopedpointer.h>

--- a/src/gui/kernel/qplatformopenglcontext.h
+++ b/src/gui/kernel/qplatformopenglcontext.h
@ -49,6 +49,7 @@
 // source and binary incompatible with future versions of Qt.
 //

+#include <QtGui/qtguiglobal.h>
 #include <QtCore/qnamespace.h>

 #ifndef QT_NO_OPENGL
--- a/src/gui/kernel/qplatformscreen.h
+++ b/src/gui/kernel/qplatformscreen.h
@ -49,6 +49,7 @@
 // source and binary incompatible with future versions of Qt.
 //

+#include <QtGui/qtguiglobal.h>
 #include <QtCore/qmetatype.h>
 #include <QtCore/qnamespace.h>
 #include <QtCore/qcoreevent.h>
--- a/src/gui/kernel/qplatformscreen_p.h
+++ b/src/gui/kernel/qplatformscreen_p.h
@ -51,6 +51,8 @@
 // We mean it.
 //

+#include <QtGui/private/qtguiglobal_p.h>
+
 QT_BEGIN_NAMESPACE

 class QScreen;
--- a/src/gui/kernel/qplatformservices.h
+++ b/src/gui/kernel/qplatformservices.h
@ -49,7 +49,7 @@
 // source and binary incompatible with future versions of Qt.
 //

-#include <QtCore/QtGlobal>
+#include <QtGui/qtguiglobal.h>

 QT_BEGIN_NAMESPACE

--- a/src/gui/kernel/qplatformsessionmanager.h
+++ b/src/gui/kernel/qplatformsessionmanager.h
@ -51,6 +51,7 @@
 // source and binary incompatible with future versions of Qt.
 //

+#include <QtGui/qtguiglobal.h>
 #include <QtCore/qmetatype.h>
 #include <QtCore/qnamespace.h>

--- a/src/gui/kernel/qplatformsharedgraphicscache.h
+++ b/src/gui/kernel/qplatformsharedgraphicscache.h
@ -49,6 +49,7 @@
 // source and binary incompatible with future versions of Qt.
 //

+#include <QtGui/qtguiglobal.h>
 #include <QtCore/qobject.h>
 #include <QtGui/qimage.h>

--- a/src/gui/kernel/qplatformsurface.h
+++ b/src/gui/kernel/qplatformsurface.h
@ -49,6 +49,7 @@
 // source and binary incompatible with future versions of Qt.
 //

+#include <QtGui/qtguiglobal.h>
 #include <QtCore/qnamespace.h>
 #include <QtGui/qsurface.h>
 #include <QtGui/qsurfaceformat.h>
--- a/src/gui/kernel/qplatformsystemtrayicon.h
+++ b/src/gui/kernel/qplatformsystemtrayicon.h
@ -41,6 +41,7 @@
 #ifndef QPLATFORMSYSTEMTRAYICON_H
 #define QPLATFORMSYSTEMTRAYICON_H

+#include <QtGui/qtguiglobal.h>
 #include "QtCore/qobject.h"

 #ifndef QT_NO_SYSTEMTRAYICON
--- a/src/gui/kernel/qplatformtheme.h
+++ b/src/gui/kernel/qplatformtheme.h
@ -49,7 +49,7 @@
 // source and binary incompatible with future versions of Qt.
 //

-#include <QtCore/QtGlobal>
+#include <QtGui/qtguiglobal.h>
 #include <QtCore/QScopedPointer>
 #include <QtGui/QKeySequence>

--- a/src/gui/kernel/qplatformtheme_p.h
+++ b/src/gui/kernel/qplatformtheme_p.h
@ -51,7 +51,7 @@
 // We mean it.
 //

-#include <QtCore/QtGlobal>
+#include <QtGui/private/qtguiglobal_p.h>
 #include "private/qkeysequence_p.h"

 QT_BEGIN_NAMESPACE
--- a/src/gui/kernel/qplatformthemefactory_p.h
+++ b/src/gui/kernel/qplatformthemefactory_p.h
@ -51,6 +51,7 @@
 // We mean it.
 //

+#include <QtGui/private/qtguiglobal_p.h>
 #include <QtCore/qstringlist.h>

 QT_BEGIN_NAMESPACE
--- a/src/gui/kernel/qplatformthemeplugin.h
+++ b/src/gui/kernel/qplatformthemeplugin.h
@ -49,6 +49,7 @@
 // source and binary incompatible with future versions of Qt.
 //

+#include <QtGui/qtguiglobal.h>
 #include <QtCore/qplugin.h>
 #include <QtCore/qfactoryinterface.h>

--- a/src/gui/kernel/qplatformwindow.h
+++ b/src/gui/kernel/qplatformwindow.h
@ -48,6 +48,7 @@
 // source and binary incompatible with future versions of Qt.
 //

+#include <QtGui/qtguiglobal.h>
 #include <QtCore/qscopedpointer.h>
 #include <QtCore/qrect.h>
 #include <QtCore/qmargins.h>
--- a/src/gui/kernel/qplatformwindow_p.h
+++ b/src/gui/kernel/qplatformwindow_p.h
@ -51,6 +51,7 @@
 // We mean it.
 //

+#include <QtGui/private/qtguiglobal_p.h>
 #include <QtCore/qrect.h>

 QT_BEGIN_NAMESPACE
--- a/src/gui/kernel/qrasterwindow.h
+++ b/src/gui/kernel/qrasterwindow.h
@ -40,6 +40,7 @@
 #ifndef QRASTERWINDOW_H
 #define QRASTERWINDOW_H

+#include <QtGui/qtguiglobal.h>
 #include <QtGui/QPaintDeviceWindow>

 QT_BEGIN_NAMESPACE
--- a/src/gui/kernel/qscreen.h
+++ b/src/gui/kernel/qscreen.h
@ -40,6 +40,7 @@
 #ifndef QSCREEN_H
 #define QSCREEN_H

+#include <QtGui/qtguiglobal.h>
 #include <QtCore/QList>
 #include <QtCore/QObject>
 #include <QtCore/QRect>
--- a/src/gui/kernel/qscreen_p.h
+++ b/src/gui/kernel/qscreen_p.h
@ -51,6 +51,7 @@
 // We mean it.
 //

+#include <QtGui/private/qtguiglobal_p.h>
 #include <QtGui/qscreen.h>
 #include <qpa/qplatformscreen.h>
 #include "qhighdpiscaling_p.h"
--- a/Show More
+++ b/Show More