Add qtwidgetsglobal.h and qtwidgetsglobal_p.h

The new modular configuration system requires one global header per module, that is included by all other files in this module. That header will later on #include the configuration file for Qt Widgets. For now it defines the Q_WIDGETS_EXPORT macro for this library. Change-Id: I6698989b952b9bac94d086d9f219e03c000f7d53 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2016-06-03 14:31:40 +02:00 · 2016-06-03 14:31:40 +02:00 · 8fc1cd085c
parent 64507c7165
commit 8fc1cd085c
258 changed files with 383 additions and 24 deletions
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@ -296,14 +296,8 @@ typedef double qreal;
 #  else
 #    define Q_CORE_EXPORT Q_DECL_IMPORT
 #  endif
-#  if defined(QT_BUILD_WIDGETS_LIB)
-#    define Q_WIDGETS_EXPORT Q_DECL_EXPORT
-#  else
-#    define Q_WIDGETS_EXPORT Q_DECL_IMPORT
-#  endif
 #else
 #  define Q_CORE_EXPORT
-#  define Q_WIDGETS_EXPORT
 #endif

 /*
--- a/src/widgets/accessible/complexwidgets_p.h
+++ b/src/widgets/accessible/complexwidgets_p.h
@ -51,6 +51,7 @@
 // We mean it.
 //

+#include <QtWidgets/private/qtwidgetsglobal_p.h>
 #include <QtCore/qpointer.h>
 #include <QtWidgets/qaccessiblewidget.h>
 #include <QtWidgets/qabstractitemview.h>
--- a/src/widgets/accessible/itemviews_p.h
+++ b/src/widgets/accessible/itemviews_p.h
@ -51,6 +51,7 @@
 // We mean it.
 //

+#include <QtWidgets/private/qtwidgetsglobal_p.h>
 #include "QtCore/qpointer.h"
 #include <QtGui/qaccessible.h>
 #include <QtWidgets/qaccessiblewidget.h>
--- a/src/widgets/accessible/qaccessiblemenu_p.h
+++ b/src/widgets/accessible/qaccessiblemenu_p.h
@ -51,6 +51,7 @@
 // We mean it.
 //

+#include <QtWidgets/private/qtwidgetsglobal_p.h>
 #include <QtWidgets/qaccessiblewidget.h>
 #include <QtCore/qpointer.h>

--- a/src/widgets/accessible/qaccessiblewidget.h
+++ b/src/widgets/accessible/qaccessiblewidget.h
@ -40,6 +40,7 @@
 #ifndef QACCESSIBLEWIDGET_H
 #define QACCESSIBLEWIDGET_H

+#include <QtWidgets/qtwidgetsglobal.h>
 #include <QtGui/qaccessibleobject.h>

 QT_BEGIN_NAMESPACE
--- a/src/widgets/accessible/qaccessiblewidgetfactory_p.h
+++ b/src/widgets/accessible/qaccessiblewidgetfactory_p.h
@ -37,6 +37,7 @@
 **
 ****************************************************************************/

+#include <QtWidgets/private/qtwidgetsglobal_p.h>
 #include <QtGui/qaccessible.h>

 #ifndef QACCESSIBLEWIDGETFACTORY_H
--- a/src/widgets/accessible/qaccessiblewidgets_p.h
+++ b/src/widgets/accessible/qaccessiblewidgets_p.h
@ -51,6 +51,7 @@
 // We mean it.
 //

+#include <QtWidgets/private/qtwidgetsglobal_p.h>
 #include <QtWidgets/qaccessiblewidget.h>

 #ifndef QT_NO_ACCESSIBILITY
--- a/src/widgets/accessible/rangecontrols_p.h
+++ b/src/widgets/accessible/rangecontrols_p.h
@ -51,6 +51,7 @@
 // We mean it.
 //

+#include <QtWidgets/private/qtwidgetsglobal_p.h>
 #include <QtWidgets/qaccessiblewidget.h>

 QT_BEGIN_NAMESPACE
--- a/src/widgets/accessible/simplewidgets_p.h
+++ b/src/widgets/accessible/simplewidgets_p.h
@ -51,6 +51,7 @@
 // We mean it.
 //

+#include <QtWidgets/private/qtwidgetsglobal_p.h>
 #include <QtCore/qcoreapplication.h>
 #include <QtWidgets/qaccessiblewidget.h>

--- a/src/widgets/dialogs/qcolordialog.h
+++ b/src/widgets/dialogs/qcolordialog.h
@ -40,6 +40,7 @@
 #ifndef QCOLORDIALOG_H
 #define QCOLORDIALOG_H

+#include <QtWidgets/qtwidgetsglobal.h>
 #include <QtWidgets/qdialog.h>

 QT_BEGIN_NAMESPACE
--- a/src/widgets/dialogs/qdialog.h
+++ b/src/widgets/dialogs/qdialog.h
@ -40,6 +40,7 @@
 #ifndef QDIALOG_H
 #define QDIALOG_H

+#include <QtWidgets/qtwidgetsglobal.h>
 #include <QtWidgets/qwidget.h>

 QT_BEGIN_NAMESPACE
--- a/src/widgets/dialogs/qdialog_p.h
+++ b/src/widgets/dialogs/qdialog_p.h
@ -51,6 +51,7 @@
 // We mean it.
 //

+#include <QtWidgets/private/qtwidgetsglobal_p.h>
 #include "private/qwidget_p.h"
 #include "QtCore/qeventloop.h"
 #include "QtCore/qpointer.h"
--- a/src/widgets/dialogs/qerrormessage.h
+++ b/src/widgets/dialogs/qerrormessage.h
@ -40,6 +40,7 @@
 #ifndef QERRORMESSAGE_H
 #define QERRORMESSAGE_H

+#include <QtWidgets/qtwidgetsglobal.h>
 #include <QtWidgets/qdialog.h>

 QT_BEGIN_NAMESPACE
--- a/src/widgets/dialogs/qfiledialog.h
+++ b/src/widgets/dialogs/qfiledialog.h
@ -40,6 +40,7 @@
 #ifndef QFILEDIALOG_H
 #define QFILEDIALOG_H

+#include <QtWidgets/qtwidgetsglobal.h>
 #include <QtCore/qdir.h>
 #include <QtCore/qstring.h>
 #include <QtCore/qurl.h>
--- a/src/widgets/dialogs/qfiledialog_p.h
+++ b/src/widgets/dialogs/qfiledialog_p.h
@ -51,7 +51,7 @@
 // We mean it.
 //

-#include <QtCore/qglobal.h>
+#include <QtWidgets/private/qtwidgetsglobal_p.h>

 #ifndef QT_NO_FILEDIALOG

--- a/src/widgets/dialogs/qfileinfogatherer_p.h
+++ b/src/widgets/dialogs/qfileinfogatherer_p.h
@ -51,6 +51,8 @@
 // We mean it.
 //

+#include <QtWidgets/private/qtwidgetsglobal_p.h>
+
 #include <qthread.h>
 #include <qmutex.h>
 #include <qwaitcondition.h>
--- a/src/widgets/dialogs/qfilesystemmodel.h
+++ b/src/widgets/dialogs/qfilesystemmodel.h
@ -40,6 +40,7 @@
 #ifndef QFILESYSTEMMODEL_H
 #define QFILESYSTEMMODEL_H

+#include <QtWidgets/qtwidgetsglobal.h>
 #include <QtCore/qabstractitemmodel.h>
 #include <QtCore/qpair.h>
 #include <QtCore/qdir.h>
--- a/src/widgets/dialogs/qfilesystemmodel_p.h
+++ b/src/widgets/dialogs/qfilesystemmodel_p.h
@ -51,6 +51,7 @@
 // We mean it.
 //

+#include <QtWidgets/private/qtwidgetsglobal_p.h>
 #include "qfilesystemmodel.h"

 #ifndef QT_NO_FILESYSTEMMODEL
--- a/src/widgets/dialogs/qfontdialog.h
+++ b/src/widgets/dialogs/qfontdialog.h
@ -40,6 +40,7 @@
 #ifndef QFONTDIALOG_H
 #define QFONTDIALOG_H

+#include <QtWidgets/qtwidgetsglobal.h>
 #include <QtGui/qwindowdefs.h>
 #include <QtWidgets/qdialog.h>
 #include <QtGui/qfont.h>
--- a/src/widgets/dialogs/qfontdialog_p.h
+++ b/src/widgets/dialogs/qfontdialog_p.h
@ -52,6 +52,7 @@
 //
 //

+#include <QtWidgets/private/qtwidgetsglobal_p.h>
 #include "private/qdialog_p.h"
 #include "qfontdatabase.h"
 #include "qfontdialog.h"
--- a/src/widgets/dialogs/qfscompleter_p.h
+++ b/src/widgets/dialogs/qfscompleter_p.h
@ -51,9 +51,12 @@
 // We mean it.
 //

+#include <QtWidgets/private/qtwidgetsglobal_p.h>
 #include "qcompleter.h"
 #include <QtWidgets/qfilesystemmodel.h>
+
 QT_BEGIN_NAMESPACE
+
 #ifndef QT_NO_FSCOMPLETER

 /*!
@ -74,7 +77,10 @@ public:
    QAbstractProxyModel *proxyModel;
    QFileSystemModel *sourceModel;
 };
+
 #endif // QT_NO_FSCOMPLETER
+
 QT_END_NAMESPACE
+
 #endif // QFSCOMPLETOR_P_H

--- a/src/widgets/dialogs/qinputdialog.h
+++ b/src/widgets/dialogs/qinputdialog.h
@ -40,6 +40,7 @@
 #ifndef QINPUTDIALOG_H
 #define QINPUTDIALOG_H

+#include <QtWidgets/qtwidgetsglobal.h>
 #include <QtWidgets/qdialog.h>
 #include <QtCore/qstring.h>
 #include <QtWidgets/qlineedit.h>
--- a/src/widgets/dialogs/qmessagebox.h
+++ b/src/widgets/dialogs/qmessagebox.h
@ -40,6 +40,7 @@
 #ifndef QMESSAGEBOX_H
 #define QMESSAGEBOX_H

+#include <QtWidgets/qtwidgetsglobal.h>
 #include <QtWidgets/qdialog.h>

 QT_BEGIN_NAMESPACE
--- a/src/widgets/dialogs/qprogressdialog.h
+++ b/src/widgets/dialogs/qprogressdialog.h
@ -40,6 +40,7 @@
 #ifndef QPROGRESSDIALOG_H
 #define QPROGRESSDIALOG_H

+#include <QtWidgets/qtwidgetsglobal.h>
 #include <QtWidgets/qdialog.h>

 QT_BEGIN_NAMESPACE
--- a/src/widgets/dialogs/qsidebar_p.h
+++ b/src/widgets/dialogs/qsidebar_p.h
@ -51,6 +51,7 @@
 // We mean it.
 //

+#include <QtWidgets/private/qtwidgetsglobal_p.h>
 #include <qlistwidget.h>
 #include <qstandarditemmodel.h>
 #include <qstyleditemdelegate.h>
--- a/src/widgets/dialogs/qwizard.h
+++ b/src/widgets/dialogs/qwizard.h
@ -40,6 +40,7 @@
 #ifndef QWIZARD_H
 #define QWIZARD_H

+#include <QtWidgets/qtwidgetsglobal.h>
 #include <QtWidgets/qdialog.h>

 QT_BEGIN_NAMESPACE
--- a/src/widgets/dialogs/qwizard_win_p.h
+++ b/src/widgets/dialogs/qwizard_win_p.h
@ -51,7 +51,7 @@
 // We mean it.
 //

-#include <QtCore/qglobal.h>
+#include <QtWidgets/private/qtwidgetsglobal_p.h>

 #ifndef QT_NO_WIZARD
 #ifndef QT_NO_STYLE_WINDOWSVISTA
--- a/src/widgets/effects/qgraphicseffect.h
+++ b/src/widgets/effects/qgraphicseffect.h
@ -40,6 +40,7 @@
 #ifndef QGRAPHICSEFFECT_H
 #define QGRAPHICSEFFECT_H

+#include <QtWidgets/qtwidgetsglobal.h>
 #include <QtCore/qobject.h>
 #include <QtCore/qpoint.h>
 #include <QtCore/qrect.h>
--- a/src/widgets/effects/qgraphicseffect_p.h
+++ b/src/widgets/effects/qgraphicseffect_p.h
@ -51,6 +51,7 @@
 // We mean it.
 //

+#include <QtWidgets/private/qtwidgetsglobal_p.h>
 #include "qgraphicseffect.h"

 #include <QPixmapCache>
--- a/src/widgets/effects/qpixmapfilter_p.h
+++ b/src/widgets/effects/qpixmapfilter_p.h
@ -51,6 +51,7 @@
 // We mean it.
 //

+#include <QtWidgets/private/qtwidgetsglobal_p.h>
 #include <QtCore/qnamespace.h>
 #include <QtGui/qpixmap.h>
 #include <QtWidgets/qgraphicseffect.h>
--- a/src/widgets/graphicsview/qgraph_p.h
+++ b/src/widgets/graphicsview/qgraph_p.h
@ -51,6 +51,7 @@
 // We mean it.
 //

+#include <QtWidgets/private/qtwidgetsglobal_p.h>
 #include <QtCore/QHash>
 #include <QtCore/QQueue>
 #include <QtCore/QString>
--- a/src/widgets/graphicsview/qgraphicsanchorlayout.h
+++ b/src/widgets/graphicsview/qgraphicsanchorlayout.h
@ -40,6 +40,7 @@
 #ifndef QGRAPHICSANCHORLAYOUT_H
 #define QGRAPHICSANCHORLAYOUT_H

+#include <QtWidgets/qtwidgetsglobal.h>
 #include <QtWidgets/qgraphicsitem.h>
 #include <QtWidgets/qgraphicslayout.h>

--- a/src/widgets/graphicsview/qgraphicsanchorlayout_p.h
+++ b/src/widgets/graphicsview/qgraphicsanchorlayout_p.h
@ -51,6 +51,7 @@
 // We mean it.
 //

+#include <QtWidgets/private/qtwidgetsglobal_p.h>
 #include <QGraphicsWidget>
 #include <private/qobject_p.h>

--- a/src/widgets/graphicsview/qgraphicsgridlayout.h
+++ b/src/widgets/graphicsview/qgraphicsgridlayout.h
@ -40,6 +40,7 @@
 #ifndef QGRAPHICSGRIDLAYOUT_H
 #define QGRAPHICSGRIDLAYOUT_H

+#include <QtWidgets/qtwidgetsglobal.h>
 #include <QtWidgets/qgraphicsitem.h>
 #include <QtWidgets/qgraphicslayout.h>

--- a/src/widgets/graphicsview/qgraphicsgridlayoutengine_p.h
+++ b/src/widgets/graphicsview/qgraphicsgridlayoutengine_p.h
@ -51,6 +51,7 @@
 // We mean it.
 //

+#include <QtWidgets/private/qtwidgetsglobal_p.h>
 #include <QtGui/private/qgridlayoutengine_p.h>

 #ifndef QT_NO_GRAPHICSVIEW
--- a/src/widgets/graphicsview/qgraphicsitem.h
+++ b/src/widgets/graphicsview/qgraphicsitem.h
@ -40,7 +40,7 @@
 #ifndef QGRAPHICSITEM_H
 #define QGRAPHICSITEM_H

-#include <QtCore/qglobal.h>
+#include <QtWidgets/qtwidgetsglobal.h>
 #include <QtCore/qobject.h>
 #include <QtCore/qvariant.h>
 #include <QtCore/qrect.h>
--- a/src/widgets/graphicsview/qgraphicsitem_p.h
+++ b/src/widgets/graphicsview/qgraphicsitem_p.h
@ -51,6 +51,7 @@
 // We mean it.
 //

+#include <QtWidgets/private/qtwidgetsglobal_p.h>
 #include "qgraphicsitem.h"
 #include "qset.h"
 #include "qpixmapcache.h"
--- a/src/widgets/graphicsview/qgraphicsitemanimation.h
+++ b/src/widgets/graphicsview/qgraphicsitemanimation.h
@ -40,6 +40,7 @@
 #ifndef QGRAPHICSITEMANIMATION_H
 #define QGRAPHICSITEMANIMATION_H

+#include <QtWidgets/qtwidgetsglobal.h>
 #include <QtCore/qobject.h>

 #if !defined(QT_NO_GRAPHICSVIEW)
--- a/src/widgets/graphicsview/qgraphicslayout.h
+++ b/src/widgets/graphicsview/qgraphicslayout.h
@ -40,6 +40,7 @@
 #ifndef QGRAPHICSLAYOUT_H
 #define QGRAPHICSLAYOUT_H

+#include <QtWidgets/qtwidgetsglobal.h>
 #include <QtWidgets/qgraphicslayoutitem.h>

 QT_BEGIN_NAMESPACE
--- a/src/widgets/graphicsview/qgraphicslayout_p.h
+++ b/src/widgets/graphicsview/qgraphicslayout_p.h
@ -51,7 +51,7 @@
 // We mean it.
 //

-#include <QtCore/qglobal.h>
+#include <QtWidgets/private/qtwidgetsglobal_p.h>

 #if !defined(QT_NO_GRAPHICSVIEW)

--- a/src/widgets/graphicsview/qgraphicslayoutitem.h
+++ b/src/widgets/graphicsview/qgraphicslayoutitem.h
@ -40,6 +40,7 @@
 #ifndef QGRAPHICSLAYOUTITEM_H
 #define QGRAPHICSLAYOUTITEM_H

+#include <QtWidgets/qtwidgetsglobal.h>
 #include <QtCore/qscopedpointer.h>
 #include <QtWidgets/qsizepolicy.h>
 #include <QtGui/qevent.h>
--- a/src/widgets/graphicsview/qgraphicslayoutitem_p.h
+++ b/src/widgets/graphicsview/qgraphicslayoutitem_p.h
@ -51,6 +51,7 @@
 // We mean it.
 //

+#include <QtWidgets/private/qtwidgetsglobal_p.h>
 #include <QtCore/QSizeF>
 #include <QtWidgets/QSizePolicy>

--- a/src/widgets/graphicsview/qgraphicslayoutstyleinfo_p.h
+++ b/src/widgets/graphicsview/qgraphicslayoutstyleinfo_p.h
@ -50,6 +50,7 @@
 // We mean it.
 //

+#include <QtWidgets/private/qtwidgetsglobal_p.h>
 #include <QtGui/private/qabstractlayoutstyleinfo_p.h>
 #include <QtWidgets/qstyleoption.h>

--- a/src/widgets/graphicsview/qgraphicslinearlayout.h
+++ b/src/widgets/graphicsview/qgraphicslinearlayout.h
@ -40,6 +40,7 @@
 #ifndef QGRAPHICSLINEARLAYOUT_H
 #define QGRAPHICSLINEARLAYOUT_H

+#include <QtWidgets/qtwidgetsglobal.h>
 #include <QtWidgets/qgraphicsitem.h>
 #include <QtWidgets/qgraphicslayout.h>

--- a/src/widgets/graphicsview/qgraphicsproxywidget.h
+++ b/src/widgets/graphicsview/qgraphicsproxywidget.h
@ -40,6 +40,7 @@
 #ifndef QGRAPHICSPROXYWIDGET_H
 #define QGRAPHICSPROXYWIDGET_H

+#include <QtWidgets/qtwidgetsglobal.h>
 #include <QtWidgets/qgraphicswidget.h>

 QT_BEGIN_NAMESPACE
--- a/src/widgets/graphicsview/qgraphicsproxywidget_p.h
+++ b/src/widgets/graphicsview/qgraphicsproxywidget_p.h
@ -51,6 +51,7 @@
 // We mean it.
 //

+#include <QtWidgets/private/qtwidgetsglobal_p.h>
 #include "qgraphicsproxywidget.h"
 #include "private/qgraphicswidget_p.h"

--- a/src/widgets/graphicsview/qgraphicsscene.h
+++ b/src/widgets/graphicsview/qgraphicsscene.h
@ -40,6 +40,7 @@
 #ifndef QGRAPHICSSCENE_H
 #define QGRAPHICSSCENE_H

+#include <QtWidgets/qtwidgetsglobal.h>
 #include <QtCore/qobject.h>
 #include <QtCore/qpoint.h>
 #include <QtCore/qrect.h>
--- a/src/widgets/graphicsview/qgraphicsscene_bsp_p.h
+++ b/src/widgets/graphicsview/qgraphicsscene_bsp_p.h
@ -51,6 +51,7 @@
 // We mean it.
 //

+#include <QtWidgets/private/qtwidgetsglobal_p.h>
 #include <QtCore/qlist.h>

 #if !defined(QT_NO_GRAPHICSVIEW)
--- a/src/widgets/graphicsview/qgraphicsscene_p.h
+++ b/src/widgets/graphicsview/qgraphicsscene_p.h
@ -51,6 +51,7 @@
 // We mean it.
 //

+#include <QtWidgets/private/qtwidgetsglobal_p.h>
 #include "qgraphicsscene.h"

 #if !defined(QT_NO_GRAPHICSVIEW)
--- a/src/widgets/graphicsview/qgraphicsscenebsptreeindex_p.h
+++ b/src/widgets/graphicsview/qgraphicsscenebsptreeindex_p.h
@ -51,7 +51,7 @@
 #ifndef QGRAPHICSBSPTREEINDEX_H
 #define QGRAPHICSBSPTREEINDEX_H

-#include <QtCore/qglobal.h>
+#include <QtWidgets/private/qtwidgetsglobal_p.h>

 #if !defined(QT_NO_GRAPHICSVIEW)

--- a/src/widgets/graphicsview/qgraphicssceneevent.h
+++ b/src/widgets/graphicsview/qgraphicssceneevent.h
@ -40,6 +40,7 @@
 #ifndef QGRAPHICSSCENEEVENT_H
 #define QGRAPHICSSCENEEVENT_H

+#include <QtWidgets/qtwidgetsglobal.h>
 #include <QtCore/qcoreevent.h>
 #include <QtCore/qpoint.h>
 #include <QtCore/qscopedpointer.h>
--- a/src/widgets/graphicsview/qgraphicssceneindex_p.h
+++ b/src/widgets/graphicsview/qgraphicssceneindex_p.h
@ -51,6 +51,7 @@
 // We mean it.
 //

+#include <QtWidgets/private/qtwidgetsglobal_p.h>
 #include "qgraphicsscene_p.h"
 #include "qgraphicsscene.h"
 #include <private/qobject_p.h>
--- a/src/widgets/graphicsview/qgraphicsscenelinearindex_p.h
+++ b/src/widgets/graphicsview/qgraphicsscenelinearindex_p.h
@ -51,7 +51,7 @@
 // We mean it.
 //

-#include <QtCore/qglobal.h>
+#include <QtWidgets/private/qtwidgetsglobal_p.h>

 #if !defined(QT_NO_GRAPHICSVIEW)

--- a/src/widgets/graphicsview/qgraphicstransform.h
+++ b/src/widgets/graphicsview/qgraphicstransform.h
@ -40,6 +40,7 @@
 #ifndef QGRAPHICSTRANSFORM_H
 #define QGRAPHICSTRANSFORM_H

+#include <QtWidgets/qtwidgetsglobal.h>
 #include <QtCore/QObject>
 #include <QtGui/QVector3D>
 #include <QtGui/QTransform>
--- a/src/widgets/graphicsview/qgraphicstransform_p.h
+++ b/src/widgets/graphicsview/qgraphicstransform_p.h
@ -51,8 +51,11 @@
 // We mean it.
 //

+#include <QtWidgets/private/qtwidgetsglobal_p.h>
 #include "private/qobject_p.h"
+
 #ifndef QT_NO_GRAPHICSVIEW
+
 QT_BEGIN_NAMESPACE

 class QGraphicsItem;
@ -73,6 +76,7 @@ public:
 };

 QT_END_NAMESPACE
+
 #endif //QT_NO_GRAPHCISVIEW

 #endif // QGRAPHICSTRANSFORM_P_H
--- a/src/widgets/graphicsview/qgraphicsview.h
+++ b/src/widgets/graphicsview/qgraphicsview.h
@ -40,6 +40,7 @@
 #ifndef QGRAPHICSVIEW_H
 #define QGRAPHICSVIEW_H

+#include <QtWidgets/qtwidgetsglobal.h>
 #include <QtCore/qmetatype.h>
 #include <QtGui/qpainter.h>
 #include <QtWidgets/qscrollarea.h>
--- a/src/widgets/graphicsview/qgraphicsview_p.h
+++ b/src/widgets/graphicsview/qgraphicsview_p.h
@ -51,6 +51,7 @@
 // We mean it.
 //

+#include <QtWidgets/private/qtwidgetsglobal_p.h>
 #include "qgraphicsview.h"

 #if !defined(QT_NO_GRAPHICSVIEW)
--- a/src/widgets/graphicsview/qgraphicswidget.h
+++ b/src/widgets/graphicsview/qgraphicswidget.h
@ -40,6 +40,7 @@
 #ifndef QGRAPHICSWIDGET_H
 #define QGRAPHICSWIDGET_H

+#include <QtWidgets/qtwidgetsglobal.h>
 #include <QtGui/qfont.h>
 #include <QtWidgets/qgraphicslayoutitem.h>
 #include <QtWidgets/qgraphicsitem.h>
--- a/src/widgets/graphicsview/qgraphicswidget_p.h
+++ b/src/widgets/graphicsview/qgraphicswidget_p.h
@ -51,6 +51,7 @@
 // We mean it.
 //

+#include <QtWidgets/private/qtwidgetsglobal_p.h>
 #include <private/qobject_p.h>
 #include "qgraphicsitem_p.h"
 #include "qgraphicswidget.h"
--- a/src/widgets/graphicsview/qsimplex_p.h
+++ b/src/widgets/graphicsview/qsimplex_p.h
@ -51,6 +51,7 @@
 // We mean it.
 //

+#include <QtWidgets/private/qtwidgetsglobal_p.h>
 #include <QtCore/qhash.h>
 #include <QtCore/qpair.h>
 #include <QtCore/qstring.h>
--- a/src/widgets/itemviews/qabstractitemdelegate.h
+++ b/src/widgets/itemviews/qabstractitemdelegate.h
@ -40,6 +40,7 @@
 #ifndef QABSTRACTITEMDELEGATE_H
 #define QABSTRACTITEMDELEGATE_H

+#include <QtWidgets/qtwidgetsglobal.h>
 #include <QtCore/qobject.h>
 #include <QtWidgets/qstyleoption.h>

--- a/src/widgets/itemviews/qabstractitemdelegate_p.h
+++ b/src/widgets/itemviews/qabstractitemdelegate_p.h
@ -51,6 +51,7 @@
 // We mean it.
 //

+#include <QtWidgets/private/qtwidgetsglobal_p.h>
 #include "qabstractitemdelegate.h"
 #include <private/qobject_p.h>

--- a/src/widgets/itemviews/qabstractitemview.h
+++ b/src/widgets/itemviews/qabstractitemview.h
@ -40,6 +40,7 @@
 #ifndef QABSTRACTITEMVIEW_H
 #define QABSTRACTITEMVIEW_H

+#include <QtWidgets/qtwidgetsglobal.h>
 #include <QtWidgets/qabstractscrollarea.h>
 #include <QtCore/qabstractitemmodel.h>
 #include <QtCore/qitemselectionmodel.h>
--- a/src/widgets/itemviews/qabstractitemview_p.h
+++ b/src/widgets/itemviews/qabstractitemview_p.h
@ -51,6 +51,7 @@
 // We mean it.
 //

+#include <QtWidgets/private/qtwidgetsglobal_p.h>
 #include "private/qabstractscrollarea_p.h"
 #include "private/qabstractitemmodel_p.h"
 #include "QtWidgets/qapplication.h"
--- a/src/widgets/itemviews/qbsptree_p.h
+++ b/src/widgets/itemviews/qbsptree_p.h
@ -51,6 +51,7 @@
 // We mean it.
 //

+#include <QtWidgets/private/qtwidgetsglobal_p.h>
 #include <qvector.h>
 #include <qrect.h>

--- a/src/widgets/itemviews/qcolumnview.h
+++ b/src/widgets/itemviews/qcolumnview.h
@ -40,6 +40,7 @@
 #ifndef QCOLUMNVIEW_H
 #define QCOLUMNVIEW_H

+#include <QtWidgets/qtwidgetsglobal.h>
 #include <QtWidgets/qabstractitemview.h>

 QT_BEGIN_NAMESPACE
--- a/src/widgets/itemviews/qcolumnview_p.h
+++ b/src/widgets/itemviews/qcolumnview_p.h
@ -51,6 +51,7 @@
 // We mean it.
 //

+#include <QtWidgets/private/qtwidgetsglobal_p.h>
 #include "qcolumnview.h"

 #ifndef QT_NO_QCOLUMNVIEW
--- a/src/widgets/itemviews/qcolumnviewgrip_p.h
+++ b/src/widgets/itemviews/qcolumnviewgrip_p.h
@ -51,6 +51,7 @@
 // We mean it.
 //

+#include <QtWidgets/private/qtwidgetsglobal_p.h>
 #include <private/qwidget_p.h>

 #ifndef QT_NO_QCOLUMNVIEW
--- a/src/widgets/itemviews/qdatawidgetmapper.h
+++ b/src/widgets/itemviews/qdatawidgetmapper.h
@ -40,6 +40,7 @@
 #ifndef QDATAWIDGETMAPPER_H
 #define QDATAWIDGETMAPPER_H

+#include <QtWidgets/qtwidgetsglobal.h>
 #include "QtCore/qobject.h"

 #ifndef QT_NO_DATAWIDGETMAPPER
--- a/src/widgets/itemviews/qdirmodel.h
+++ b/src/widgets/itemviews/qdirmodel.h
@ -40,6 +40,7 @@
 #ifndef QDIRMODEL_H
 #define QDIRMODEL_H

+#include <QtWidgets/qtwidgetsglobal.h>
 #include <QtCore/qabstractitemmodel.h>
 #include <QtCore/qdir.h>
 #include <QtWidgets/qfileiconprovider.h>
--- a/src/widgets/itemviews/qfileiconprovider.h
+++ b/src/widgets/itemviews/qfileiconprovider.h
@ -40,6 +40,7 @@
 #ifndef QFILEICONPROVIDER_H
 #define QFILEICONPROVIDER_H

+#include <QtWidgets/qtwidgetsglobal.h>
 #include <QtCore/qfileinfo.h>
 #include <QtCore/qscopedpointer.h>
 #include <QtGui/qicon.h>
--- a/src/widgets/itemviews/qfileiconprovider_p.h
+++ b/src/widgets/itemviews/qfileiconprovider_p.h
@ -51,6 +51,7 @@
 // We mean it.
 //

+#include <QtWidgets/private/qtwidgetsglobal_p.h>
 #include "qfileiconprovider.h"

 #include <QtCore/qstring.h>
--- a/src/widgets/itemviews/qheaderview.h
+++ b/src/widgets/itemviews/qheaderview.h
@ -40,6 +40,7 @@
 #ifndef QHEADERVIEW_H
 #define QHEADERVIEW_H

+#include <QtWidgets/qtwidgetsglobal.h>
 #include <QtWidgets/qabstractitemview.h>

 QT_BEGIN_NAMESPACE
--- a/src/widgets/itemviews/qheaderview_p.h
+++ b/src/widgets/itemviews/qheaderview_p.h
@ -51,6 +51,7 @@
 // We mean it.
 //

+#include <QtWidgets/private/qtwidgetsglobal_p.h>
 #include "private/qabstractitemview_p.h"

 #ifndef QT_NO_ITEMVIEWS
--- a/src/widgets/itemviews/qitemdelegate.h
+++ b/src/widgets/itemviews/qitemdelegate.h
@ -40,6 +40,7 @@
 #ifndef QITEMDELEGATE_H
 #define QITEMDELEGATE_H

+#include <QtWidgets/qtwidgetsglobal.h>
 #include <QtWidgets/qabstractitemdelegate.h>
 #include <QtCore/qstring.h>
 #include <QtGui/qpixmap.h>
--- a/src/widgets/itemviews/qitemeditorfactory.h
+++ b/src/widgets/itemviews/qitemeditorfactory.h
@ -40,6 +40,7 @@
 #ifndef QITEMEDITORFACTORY_H
 #define QITEMEDITORFACTORY_H

+#include <QtWidgets/qtwidgetsglobal.h>
 #include <QtCore/qmetaobject.h>
 #include <QtCore/qbytearray.h>
 #include <QtCore/qhash.h>
--- a/src/widgets/itemviews/qitemeditorfactory_p.h
+++ b/src/widgets/itemviews/qitemeditorfactory_p.h
@ -52,7 +52,7 @@
 //


-
+#include <QtWidgets/private/qtwidgetsglobal_p.h>
 #include <qlineedit.h>

 #ifndef QT_NO_ITEMVIEWS
--- a/src/widgets/itemviews/qlistview.h
+++ b/src/widgets/itemviews/qlistview.h
@ -40,6 +40,7 @@
 #ifndef QLISTVIEW_H
 #define QLISTVIEW_H

+#include <QtWidgets/qtwidgetsglobal.h>
 #include <QtWidgets/qabstractitemview.h>

 QT_BEGIN_NAMESPACE
--- a/src/widgets/itemviews/qlistview_p.h
+++ b/src/widgets/itemviews/qlistview_p.h
@ -51,6 +51,7 @@
 // We mean it.
 //

+#include <QtWidgets/private/qtwidgetsglobal_p.h>
 #include "private/qabstractitemview_p.h"
 #include "qrubberband.h"
 #include "qbitarray.h"
--- a/src/widgets/itemviews/qlistwidget.h
+++ b/src/widgets/itemviews/qlistwidget.h
@ -40,6 +40,7 @@
 #ifndef QLISTWIDGET_H
 #define QLISTWIDGET_H

+#include <QtWidgets/qtwidgetsglobal.h>
 #include <QtWidgets/qlistview.h>
 #include <QtCore/qvariant.h>
 #include <QtCore/qvector.h>
--- a/src/widgets/itemviews/qlistwidget_p.h
+++ b/src/widgets/itemviews/qlistwidget_p.h
@ -50,6 +50,7 @@
 // We mean it.
 //

+#include <QtWidgets/private/qtwidgetsglobal_p.h>
 #include <QtCore/qabstractitemmodel.h>
 #include <QtWidgets/qabstractitemview.h>
 #include <QtWidgets/qlistwidget.h>
--- a/src/widgets/itemviews/qstyleditemdelegate.h
+++ b/src/widgets/itemviews/qstyleditemdelegate.h
@ -40,6 +40,7 @@
 #ifndef QSTYLEDITEMDELEGATE_H
 #define QSTYLEDITEMDELEGATE_H

+#include <QtWidgets/qtwidgetsglobal.h>
 #include <QtWidgets/qabstractitemdelegate.h>
 #include <QtCore/qstring.h>
 #include <QtGui/qpixmap.h>
--- a/src/widgets/itemviews/qtableview.h
+++ b/src/widgets/itemviews/qtableview.h
@ -40,6 +40,7 @@
 #ifndef QTABLEVIEW_H
 #define QTABLEVIEW_H

+#include <QtWidgets/qtwidgetsglobal.h>
 #include <QtWidgets/qabstractitemview.h>

 QT_BEGIN_NAMESPACE
--- a/src/widgets/itemviews/qtableview_p.h
+++ b/src/widgets/itemviews/qtableview_p.h
@ -51,6 +51,7 @@
 // We mean it.
 //

+#include <QtWidgets/private/qtwidgetsglobal_p.h>
 #include <QtCore/QList>
 #include <QtCore/QLinkedList>
 #include <QtCore/QMap>
--- a/src/widgets/itemviews/qtablewidget.h
+++ b/src/widgets/itemviews/qtablewidget.h
@ -40,6 +40,7 @@
 #ifndef QTABLEWIDGET_H
 #define QTABLEWIDGET_H

+#include <QtWidgets/qtwidgetsglobal.h>
 #include <QtWidgets/qtableview.h>
 #include <QtCore/qvariant.h>
 #include <QtCore/qvector.h>
--- a/src/widgets/itemviews/qtablewidget_p.h
+++ b/src/widgets/itemviews/qtablewidget_p.h
@ -50,6 +50,7 @@
 // We mean it.
 //

+#include <QtWidgets/private/qtwidgetsglobal_p.h>
 #include <qheaderview.h>
 #include <qtablewidget.h>
 #include <qabstractitemmodel.h>
--- a/src/widgets/itemviews/qtreeview.h
+++ b/src/widgets/itemviews/qtreeview.h
@ -40,6 +40,7 @@
 #ifndef QTREEVIEW_H
 #define QTREEVIEW_H

+#include <QtWidgets/qtwidgetsglobal.h>
 #include <QtWidgets/qabstractitemview.h>

 QT_BEGIN_NAMESPACE
--- a/src/widgets/itemviews/qtreeview_p.h
+++ b/src/widgets/itemviews/qtreeview_p.h
@ -51,6 +51,7 @@
 // We mean it.
 //

+#include <QtWidgets/private/qtwidgetsglobal_p.h>
 #include "private/qabstractitemview_p.h"
 #include <QtCore/qvariantanimation.h>
 #include <QtCore/qabstractitemmodel.h>
--- a/src/widgets/itemviews/qtreewidget.h
+++ b/src/widgets/itemviews/qtreewidget.h
@ -40,6 +40,7 @@
 #ifndef QTREEWIDGET_H
 #define QTREEWIDGET_H

+#include <QtWidgets/qtwidgetsglobal.h>
 #include <QtWidgets/qtreeview.h>
 #include <QtWidgets/qtreewidgetitemiterator.h>
 #include <QtCore/qvariant.h>
--- a/src/widgets/itemviews/qtreewidget_p.h
+++ b/src/widgets/itemviews/qtreewidget_p.h
@ -50,6 +50,7 @@
 // We mean it.
 //

+#include <QtWidgets/private/qtwidgetsglobal_p.h>
 #include <QtCore/qabstractitemmodel.h>
 #include <private/qabstractitemmodel_p.h>
 #include <QtCore/qpair.h>
--- a/src/widgets/itemviews/qtreewidgetitemiterator.h
+++ b/src/widgets/itemviews/qtreewidgetitemiterator.h
@ -40,7 +40,7 @@
 #ifndef QTREEWIDGETITEMITERATOR_H
 #define QTREEWIDGETITEMITERATOR_H

-#include <QtCore/qglobal.h>
+#include <QtWidgets/qtwidgetsglobal.h>
 #include <QtCore/qscopedpointer.h>

 QT_BEGIN_NAMESPACE
--- a/src/widgets/itemviews/qwidgetitemdata_p.h
+++ b/src/widgets/itemviews/qwidgetitemdata_p.h
@ -40,6 +40,7 @@
 #ifndef QWIDGETITEMDATA_P_H
 #define QWIDGETITEMDATA_P_H

+#include <QtWidgets/private/qtwidgetsglobal_p.h>
 #include <QtCore/qdatastream.h>

 //
--- a/src/widgets/kernel/kernel.pri
+++ b/src/widgets/kernel/kernel.pri
@ -5,8 +5,10 @@ PRECOMPILED_HEADER = kernel/qt_widgets_pch.h

 KERNEL_P= kernel
 HEADERS += \
-	kernel/qaction.h \
-    kernel/qaction_p.h \
+        kernel/qtwidgetsglobal.h \
+        kernel/qtwidgetsglobal_p.h \
+        kernel/qaction.h \
+        kernel/qaction_p.h \
 	kernel/qactiongroup.h \
 	kernel/qapplication.h \
 	kernel/qapplication_p.h \
--- a/src/widgets/kernel/qaction.h
+++ b/src/widgets/kernel/qaction.h
@ -40,6 +40,7 @@
 #ifndef QACTION_H
 #define QACTION_H

+#include <QtWidgets/qtwidgetsglobal.h>
 #include <QtGui/qkeysequence.h>
 #include <QtCore/qstring.h>
 #include <QtWidgets/qwidget.h>
--- a/src/widgets/kernel/qaction_p.h
+++ b/src/widgets/kernel/qaction_p.h
@ -51,6 +51,7 @@
 // We mean it.
 //

+#include <QtWidgets/private/qtwidgetsglobal_p.h>
 #include "QtWidgets/qaction.h"
 #include "QtWidgets/qmenu.h"
 #include "private/qgraphicswidget_p.h"
--- a/src/widgets/kernel/qactiongroup.h
+++ b/src/widgets/kernel/qactiongroup.h
@ -40,6 +40,7 @@
 #ifndef QACTIONGROUP_H
 #define QACTIONGROUP_H

+#include <QtWidgets/qtwidgetsglobal.h>
 #include <QtWidgets/qaction.h>

 QT_BEGIN_NAMESPACE
--- a/src/widgets/kernel/qapplication.h
+++ b/src/widgets/kernel/qapplication.h
@ -40,6 +40,7 @@
 #ifndef QAPPLICATION_H
 #define QAPPLICATION_H

+#include <QtWidgets/qtwidgetsglobal.h>
 #include <QtCore/qcoreapplication.h>
 #include <QtGui/qwindowdefs.h>
 #include <QtCore/qpoint.h>
--- a/src/widgets/kernel/qapplication_p.h
+++ b/src/widgets/kernel/qapplication_p.h
@ -52,6 +52,7 @@
 // We mean it.
 //

+#include <QtWidgets/private/qtwidgetsglobal_p.h>
 #include "QtWidgets/qapplication.h"
 #include "QtGui/qevent.h"
 #include "QtGui/qfont.h"
--- a/src/widgets/kernel/qboxlayout.h
+++ b/src/widgets/kernel/qboxlayout.h
@ -40,6 +40,7 @@
 #ifndef QBOXLAYOUT_H
 #define QBOXLAYOUT_H

+#include <QtWidgets/qtwidgetsglobal.h>
 #include <QtWidgets/qlayout.h>
 #ifdef QT_INCLUDE_COMPAT
 #include <QtWidgets/qwidget.h>
--- a/src/widgets/kernel/qdesktopwidget.h
+++ b/src/widgets/kernel/qdesktopwidget.h
@ -40,6 +40,7 @@
 #ifndef QDESKTOPWIDGET_H
 #define QDESKTOPWIDGET_H

+#include <QtWidgets/qtwidgetsglobal.h>
 #include <QtWidgets/qwidget.h>

 QT_BEGIN_NAMESPACE
--- a/Show More
+++ b/Show More