diff options
Diffstat (limited to 'src')
258 files changed, 383 insertions, 24 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 971e1ef6e8..1bf59847c4 100644 --- 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 /* diff --git a/src/widgets/accessible/complexwidgets_p.h b/src/widgets/accessible/complexwidgets_p.h index 44549086ba..d43b06f4a4 100644 --- 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> diff --git a/src/widgets/accessible/itemviews_p.h b/src/widgets/accessible/itemviews_p.h index 95a0032139..ed421d3146 100644 --- 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> diff --git a/src/widgets/accessible/qaccessiblemenu_p.h b/src/widgets/accessible/qaccessiblemenu_p.h index 5a5a4a3222..52afeb5a04 100644 --- 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> diff --git a/src/widgets/accessible/qaccessiblewidget.h b/src/widgets/accessible/qaccessiblewidget.h index ebba30b2d5..e09c3ff489 100644 --- 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 diff --git a/src/widgets/accessible/qaccessiblewidgetfactory_p.h b/src/widgets/accessible/qaccessiblewidgetfactory_p.h index 2571399060..5da609ddca 100644 --- 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 diff --git a/src/widgets/accessible/qaccessiblewidgets_p.h b/src/widgets/accessible/qaccessiblewidgets_p.h index 986f2b2789..052958d4c7 100644 --- 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 diff --git a/src/widgets/accessible/rangecontrols_p.h b/src/widgets/accessible/rangecontrols_p.h index cd351fbb3c..28f613462d 100644 --- 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 diff --git a/src/widgets/accessible/simplewidgets_p.h b/src/widgets/accessible/simplewidgets_p.h index ec9cc893a5..8bd0af8261 100644 --- 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> diff --git a/src/widgets/dialogs/qcolordialog.h b/src/widgets/dialogs/qcolordialog.h index b036570427..3b56f0b5d1 100644 --- 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 diff --git a/src/widgets/dialogs/qdialog.h b/src/widgets/dialogs/qdialog.h index 562fbb63bb..265790b0e5 100644 --- 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 diff --git a/src/widgets/dialogs/qdialog_p.h b/src/widgets/dialogs/qdialog_p.h index 6fe4b602a1..1c7c5f3c2a 100644 --- 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" diff --git a/src/widgets/dialogs/qerrormessage.h b/src/widgets/dialogs/qerrormessage.h index 03d0dbf5c5..5ffa568c10 100644 --- 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 diff --git a/src/widgets/dialogs/qfiledialog.h b/src/widgets/dialogs/qfiledialog.h index f13cb98e96..4ade50793d 100644 --- 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> diff --git a/src/widgets/dialogs/qfiledialog_p.h b/src/widgets/dialogs/qfiledialog_p.h index d10f6d7065..afebad4457 100644 --- 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 diff --git a/src/widgets/dialogs/qfileinfogatherer_p.h b/src/widgets/dialogs/qfileinfogatherer_p.h index a6ae136c21..3186e9d015 100644 --- 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> diff --git a/src/widgets/dialogs/qfilesystemmodel.h b/src/widgets/dialogs/qfilesystemmodel.h index 6d50d0b606..7d790124c8 100644 --- 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> diff --git a/src/widgets/dialogs/qfilesystemmodel_p.h b/src/widgets/dialogs/qfilesystemmodel_p.h index beb25f665d..92398d981f 100644 --- 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 diff --git a/src/widgets/dialogs/qfontdialog.h b/src/widgets/dialogs/qfontdialog.h index f76ce1b7f3..276f8f5e83 100644 --- 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> diff --git a/src/widgets/dialogs/qfontdialog_p.h b/src/widgets/dialogs/qfontdialog_p.h index d6a6e87ee2..033f5a2be8 100644 --- 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" diff --git a/src/widgets/dialogs/qfscompleter_p.h b/src/widgets/dialogs/qfscompleter_p.h index a3341999f7..c073fa1521 100644 --- 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 diff --git a/src/widgets/dialogs/qinputdialog.h b/src/widgets/dialogs/qinputdialog.h index 8adaf5a430..2fbea908cb 100644 --- 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> diff --git a/src/widgets/dialogs/qmessagebox.h b/src/widgets/dialogs/qmessagebox.h index 8cded63a3c..c6a55964fe 100644 --- 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 diff --git a/src/widgets/dialogs/qprogressdialog.h b/src/widgets/dialogs/qprogressdialog.h index 888deac046..a5e333259f 100644 --- 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 diff --git a/src/widgets/dialogs/qsidebar_p.h b/src/widgets/dialogs/qsidebar_p.h index 210c86be01..3e177e7e68 100644 --- 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> diff --git a/src/widgets/dialogs/qwizard.h b/src/widgets/dialogs/qwizard.h index a188833ef3..9ce68b6566 100644 --- 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 diff --git a/src/widgets/dialogs/qwizard_win_p.h b/src/widgets/dialogs/qwizard_win_p.h index c0aa6f7bc4..288e7adaf5 100644 --- 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 diff --git a/src/widgets/effects/qgraphicseffect.h b/src/widgets/effects/qgraphicseffect.h index 07c826fc93..06ee78f2a0 100644 --- 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> diff --git a/src/widgets/effects/qgraphicseffect_p.h b/src/widgets/effects/qgraphicseffect_p.h index 3c8dc0338d..12bdbfe6fc 100644 --- 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> diff --git a/src/widgets/effects/qpixmapfilter_p.h b/src/widgets/effects/qpixmapfilter_p.h index 0aeedaf827..b9af3ae916 100644 --- 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> diff --git a/src/widgets/graphicsview/qgraph_p.h b/src/widgets/graphicsview/qgraph_p.h index 14f7122d5c..b0bf3c91c9 100644 --- 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> diff --git a/src/widgets/graphicsview/qgraphicsanchorlayout.h b/src/widgets/graphicsview/qgraphicsanchorlayout.h index e824edfd0a..6d69957400 100644 --- 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> diff --git a/src/widgets/graphicsview/qgraphicsanchorlayout_p.h b/src/widgets/graphicsview/qgraphicsanchorlayout_p.h index c284e6ace3..ee11cb8561 100644 --- 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> diff --git a/src/widgets/graphicsview/qgraphicsgridlayout.h b/src/widgets/graphicsview/qgraphicsgridlayout.h index 0687511966..c7c2edd2a2 100644 --- 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> diff --git a/src/widgets/graphicsview/qgraphicsgridlayoutengine_p.h b/src/widgets/graphicsview/qgraphicsgridlayoutengine_p.h index 08e4af6f8c..a099dace6b 100644 --- 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 diff --git a/src/widgets/graphicsview/qgraphicsitem.h b/src/widgets/graphicsview/qgraphicsitem.h index fa51739bb9..59656f5b0b 100644 --- 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> diff --git a/src/widgets/graphicsview/qgraphicsitem_p.h b/src/widgets/graphicsview/qgraphicsitem_p.h index e45e18c484..c88236d6e8 100644 --- 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" diff --git a/src/widgets/graphicsview/qgraphicsitemanimation.h b/src/widgets/graphicsview/qgraphicsitemanimation.h index 9c2a26e5d5..f02e0ac793 100644 --- 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) diff --git a/src/widgets/graphicsview/qgraphicslayout.h b/src/widgets/graphicsview/qgraphicslayout.h index bf79f29f48..5b1c465414 100644 --- 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 diff --git a/src/widgets/graphicsview/qgraphicslayout_p.h b/src/widgets/graphicsview/qgraphicslayout_p.h index 043d2cf077..47d8611786 100644 --- 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) diff --git a/src/widgets/graphicsview/qgraphicslayoutitem.h b/src/widgets/graphicsview/qgraphicslayoutitem.h index 639f04f1bd..02bda0ad8d 100644 --- 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> diff --git a/src/widgets/graphicsview/qgraphicslayoutitem_p.h b/src/widgets/graphicsview/qgraphicslayoutitem_p.h index 355e2ab47d..96e7cc7fd9 100644 --- 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> diff --git a/src/widgets/graphicsview/qgraphicslayoutstyleinfo_p.h b/src/widgets/graphicsview/qgraphicslayoutstyleinfo_p.h index 7edc61ef12..9d3aa22548 100644 --- 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> diff --git a/src/widgets/graphicsview/qgraphicslinearlayout.h b/src/widgets/graphicsview/qgraphicslinearlayout.h index c30f11b1b2..ebe8e903d9 100644 --- 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> diff --git a/src/widgets/graphicsview/qgraphicsproxywidget.h b/src/widgets/graphicsview/qgraphicsproxywidget.h index 7fbfba6dac..8112c65d63 100644 --- 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 diff --git a/src/widgets/graphicsview/qgraphicsproxywidget_p.h b/src/widgets/graphicsview/qgraphicsproxywidget_p.h index 1e49bcb143..0797ba7066 100644 --- 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" diff --git a/src/widgets/graphicsview/qgraphicsscene.h b/src/widgets/graphicsview/qgraphicsscene.h index 5535295676..b1846303f7 100644 --- 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> diff --git a/src/widgets/graphicsview/qgraphicsscene_bsp_p.h b/src/widgets/graphicsview/qgraphicsscene_bsp_p.h index 5b83817911..1ab9c10d6a 100644 --- 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) diff --git a/src/widgets/graphicsview/qgraphicsscene_p.h b/src/widgets/graphicsview/qgraphicsscene_p.h index ed9dd99822..795676878b 100644 --- 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) diff --git a/src/widgets/graphicsview/qgraphicsscenebsptreeindex_p.h b/src/widgets/graphicsview/qgraphicsscenebsptreeindex_p.h index faa847ff80..b195a4757c 100644 --- 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) diff --git a/src/widgets/graphicsview/qgraphicssceneevent.h b/src/widgets/graphicsview/qgraphicssceneevent.h index 3b4eaa828e..4d6cde1b87 100644 --- 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> diff --git a/src/widgets/graphicsview/qgraphicssceneindex_p.h b/src/widgets/graphicsview/qgraphicssceneindex_p.h index 79936aee66..2085acd532 100644 --- 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> diff --git a/src/widgets/graphicsview/qgraphicsscenelinearindex_p.h b/src/widgets/graphicsview/qgraphicsscenelinearindex_p.h index 7ad14d1e6e..a9d73459c0 100644 --- 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) diff --git a/src/widgets/graphicsview/qgraphicstransform.h b/src/widgets/graphicsview/qgraphicstransform.h index 7d5004c7a0..6a76926725 100644 --- 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> diff --git a/src/widgets/graphicsview/qgraphicstransform_p.h b/src/widgets/graphicsview/qgraphicstransform_p.h index 85ebdf87ba..39f7ab5487 100644 --- 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 diff --git a/src/widgets/graphicsview/qgraphicsview.h b/src/widgets/graphicsview/qgraphicsview.h index 97152d3bca..327a75c374 100644 --- 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> diff --git a/src/widgets/graphicsview/qgraphicsview_p.h b/src/widgets/graphicsview/qgraphicsview_p.h index 7c4058b18b..9065650216 100644 --- 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) diff --git a/src/widgets/graphicsview/qgraphicswidget.h b/src/widgets/graphicsview/qgraphicswidget.h index e147c06fc9..5cb97db381 100644 --- 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> diff --git a/src/widgets/graphicsview/qgraphicswidget_p.h b/src/widgets/graphicsview/qgraphicswidget_p.h index 195704f915..18542c68e6 100644 --- 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" diff --git a/src/widgets/graphicsview/qsimplex_p.h b/src/widgets/graphicsview/qsimplex_p.h index 61af6fbc3d..634b2e0425 100644 --- 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> diff --git a/src/widgets/itemviews/qabstractitemdelegate.h b/src/widgets/itemviews/qabstractitemdelegate.h index 9fe72655ab..9f7a7716af 100644 --- 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> diff --git a/src/widgets/itemviews/qabstractitemdelegate_p.h b/src/widgets/itemviews/qabstractitemdelegate_p.h index 2fd38bdfd7..04d929a0ac 100644 --- 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> diff --git a/src/widgets/itemviews/qabstractitemview.h b/src/widgets/itemviews/qabstractitemview.h index b8d386f234..b080f84e90 100644 --- 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> diff --git a/src/widgets/itemviews/qabstractitemview_p.h b/src/widgets/itemviews/qabstractitemview_p.h index 60ae1559b1..3877969f87 100644 --- 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" diff --git a/src/widgets/itemviews/qbsptree_p.h b/src/widgets/itemviews/qbsptree_p.h index 4e57297296..5fd7a5c45f 100644 --- 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> diff --git a/src/widgets/itemviews/qcolumnview.h b/src/widgets/itemviews/qcolumnview.h index 1cf6acc405..7d5e2f5cd1 100644 --- 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 diff --git a/src/widgets/itemviews/qcolumnview_p.h b/src/widgets/itemviews/qcolumnview_p.h index 73d3e440d5..7eff0f66cd 100644 --- 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 diff --git a/src/widgets/itemviews/qcolumnviewgrip_p.h b/src/widgets/itemviews/qcolumnviewgrip_p.h index 8c82486968..3447f9f824 100644 --- 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 diff --git a/src/widgets/itemviews/qdatawidgetmapper.h b/src/widgets/itemviews/qdatawidgetmapper.h index e7e4bc7210..4d244349ad 100644 --- 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 diff --git a/src/widgets/itemviews/qdirmodel.h b/src/widgets/itemviews/qdirmodel.h index 7b4b859e0e..90a9809986 100644 --- 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> diff --git a/src/widgets/itemviews/qfileiconprovider.h b/src/widgets/itemviews/qfileiconprovider.h index e4c8c0d23e..732ca1ac8e 100644 --- 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> diff --git a/src/widgets/itemviews/qfileiconprovider_p.h b/src/widgets/itemviews/qfileiconprovider_p.h index 1cf7f947ad..4726b15816 100644 --- 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> diff --git a/src/widgets/itemviews/qheaderview.h b/src/widgets/itemviews/qheaderview.h index c2e3a1f05e..4be97c0c7e 100644 --- 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 diff --git a/src/widgets/itemviews/qheaderview_p.h b/src/widgets/itemviews/qheaderview_p.h index bbef2127a6..0356d79ff7 100644 --- 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 diff --git a/src/widgets/itemviews/qitemdelegate.h b/src/widgets/itemviews/qitemdelegate.h index e02da15f5e..3d98419c80 100644 --- 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> diff --git a/src/widgets/itemviews/qitemeditorfactory.h b/src/widgets/itemviews/qitemeditorfactory.h index b5f8fa2354..785d4d84ea 100644 --- 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> diff --git a/src/widgets/itemviews/qitemeditorfactory_p.h b/src/widgets/itemviews/qitemeditorfactory_p.h index 3b080c3a44..91edcf65ba 100644 --- 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 diff --git a/src/widgets/itemviews/qlistview.h b/src/widgets/itemviews/qlistview.h index f44cf90616..e918e66d38 100644 --- 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 diff --git a/src/widgets/itemviews/qlistview_p.h b/src/widgets/itemviews/qlistview_p.h index 90fb9e1407..42cb6b4eef 100644 --- 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" diff --git a/src/widgets/itemviews/qlistwidget.h b/src/widgets/itemviews/qlistwidget.h index 06e2469398..c70e0522b7 100644 --- 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> diff --git a/src/widgets/itemviews/qlistwidget_p.h b/src/widgets/itemviews/qlistwidget_p.h index bb0c35db5f..eaddfc6e6e 100644 --- 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> diff --git a/src/widgets/itemviews/qstyleditemdelegate.h b/src/widgets/itemviews/qstyleditemdelegate.h index bf011cdf10..d30e6e0e9c 100644 --- 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> diff --git a/src/widgets/itemviews/qtableview.h b/src/widgets/itemviews/qtableview.h index 5ab05b91bf..8c9ac379bc 100644 --- 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 diff --git a/src/widgets/itemviews/qtableview_p.h b/src/widgets/itemviews/qtableview_p.h index 617ecb1642..2ca158d657 100644 --- 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> diff --git a/src/widgets/itemviews/qtablewidget.h b/src/widgets/itemviews/qtablewidget.h index 91249e47ee..5dde93f628 100644 --- 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> diff --git a/src/widgets/itemviews/qtablewidget_p.h b/src/widgets/itemviews/qtablewidget_p.h index d3a2f02205..313577befe 100644 --- 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> diff --git a/src/widgets/itemviews/qtreeview.h b/src/widgets/itemviews/qtreeview.h index 6fd6799b7e..b3a88db005 100644 --- 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 diff --git a/src/widgets/itemviews/qtreeview_p.h b/src/widgets/itemviews/qtreeview_p.h index a3619ce13b..56f3340966 100644 --- 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> diff --git a/src/widgets/itemviews/qtreewidget.h b/src/widgets/itemviews/qtreewidget.h index e360d62c5f..36ba9985bd 100644 --- 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> diff --git a/src/widgets/itemviews/qtreewidget_p.h b/src/widgets/itemviews/qtreewidget_p.h index 7e7e8e9e35..7789693db4 100644 --- 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> diff --git a/src/widgets/itemviews/qtreewidgetitemiterator.h b/src/widgets/itemviews/qtreewidgetitemiterator.h index 2cdf03fd7a..db17a96abd 100644 --- 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 diff --git a/src/widgets/itemviews/qwidgetitemdata_p.h b/src/widgets/itemviews/qwidgetitemdata_p.h index 6c100553ba..b7ed6ed862 100644 --- 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> // diff --git a/src/widgets/kernel/kernel.pri b/src/widgets/kernel/kernel.pri index 0060ad2d31..b40a33b2af 100644 --- 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 \ diff --git a/src/widgets/kernel/qaction.h b/src/widgets/kernel/qaction.h index bd491c89ca..97948a2457 100644 --- 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> diff --git a/src/widgets/kernel/qaction_p.h b/src/widgets/kernel/qaction_p.h index 84c6774141..8ee71a5ff0 100644 --- 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" diff --git a/src/widgets/kernel/qactiongroup.h b/src/widgets/kernel/qactiongroup.h index b9d82aeb8c..61c90b911d 100644 --- 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 diff --git a/src/widgets/kernel/qapplication.h b/src/widgets/kernel/qapplication.h index 52f44759f4..be5ec2ad05 100644 --- 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> diff --git a/src/widgets/kernel/qapplication_p.h b/src/widgets/kernel/qapplication_p.h index 8aab3bfae4..dd0edc7c80 100644 --- 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" diff --git a/src/widgets/kernel/qboxlayout.h b/src/widgets/kernel/qboxlayout.h index 6c548fbbca..9c7d0e593f 100644 --- 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> diff --git a/src/widgets/kernel/qdesktopwidget.h b/src/widgets/kernel/qdesktopwidget.h index 9fb6b293f7..64e1c568eb 100644 --- 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 diff --git a/src/widgets/kernel/qdesktopwidget_p.h b/src/widgets/kernel/qdesktopwidget_p.h index a590024b7c..4846a868aa 100644 --- a/src/widgets/kernel/qdesktopwidget_p.h +++ b/src/widgets/kernel/qdesktopwidget_p.h @@ -51,6 +51,7 @@ #ifndef QDESKTOPWIDGET_P_H #define QDESKTOPWIDGET_P_H +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include "QDesktopWidget" #include "private/qwidget_p.h" diff --git a/src/widgets/kernel/qformlayout.h b/src/widgets/kernel/qformlayout.h index ca15ec6f9a..b4185374fd 100644 --- a/src/widgets/kernel/qformlayout.h +++ b/src/widgets/kernel/qformlayout.h @@ -40,6 +40,7 @@ #ifndef QFORMLAYOUT_H #define QFORMLAYOUT_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/QLayout> QT_BEGIN_NAMESPACE diff --git a/src/widgets/kernel/qgesture.h b/src/widgets/kernel/qgesture.h index 57b59abf60..034d1d88c1 100644 --- a/src/widgets/kernel/qgesture.h +++ b/src/widgets/kernel/qgesture.h @@ -40,6 +40,7 @@ #ifndef QGESTURE_H #define QGESTURE_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtCore/qobject.h> #include <QtCore/qlist.h> #include <QtCore/qdatetime.h> diff --git a/src/widgets/kernel/qgesture_p.h b/src/widgets/kernel/qgesture_p.h index b438b81e31..636103c1e1 100644 --- a/src/widgets/kernel/qgesture_p.h +++ b/src/widgets/kernel/qgesture_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include "qrect.h" #include "qpoint.h" #include "qgesture.h" diff --git a/src/widgets/kernel/qgesturemanager_p.h b/src/widgets/kernel/qgesturemanager_p.h index 9cd1f79418..ec51466a63 100644 --- a/src/widgets/kernel/qgesturemanager_p.h +++ b/src/widgets/kernel/qgesturemanager_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include "qobject.h" #include "qbasictimer.h" #include "private/qwidget_p.h" diff --git a/src/widgets/kernel/qgesturerecognizer.h b/src/widgets/kernel/qgesturerecognizer.h index f44f763217..04e85c46cc 100644 --- a/src/widgets/kernel/qgesturerecognizer.h +++ b/src/widgets/kernel/qgesturerecognizer.h @@ -40,7 +40,7 @@ #ifndef QGESTURERECOGNIZER_H #define QGESTURERECOGNIZER_H -#include <QtCore/qglobal.h> +#include <QtWidgets/qtwidgetsglobal.h> #include <QtCore/qnamespace.h> #ifndef QT_NO_GESTURES diff --git a/src/widgets/kernel/qgridlayout.h b/src/widgets/kernel/qgridlayout.h index fc6e70748f..51dd65d181 100644 --- a/src/widgets/kernel/qgridlayout.h +++ b/src/widgets/kernel/qgridlayout.h @@ -40,6 +40,7 @@ #ifndef QGRIDLAYOUT_H #define QGRIDLAYOUT_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qlayout.h> #ifdef QT_INCLUDE_COMPAT #include <QtWidgets/qwidget.h> diff --git a/src/widgets/kernel/qlayout.h b/src/widgets/kernel/qlayout.h index d76e12ca8c..2de12b4f99 100644 --- a/src/widgets/kernel/qlayout.h +++ b/src/widgets/kernel/qlayout.h @@ -40,6 +40,7 @@ #ifndef QLAYOUT_H #define QLAYOUT_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtCore/qobject.h> #include <QtWidgets/qlayoutitem.h> #include <QtWidgets/qsizepolicy.h> diff --git a/src/widgets/kernel/qlayout_p.h b/src/widgets/kernel/qlayout_p.h index 0d70c74fe5..8a1b12a6be 100644 --- a/src/widgets/kernel/qlayout_p.h +++ b/src/widgets/kernel/qlayout_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include "private/qobject_p.h" #include "qstyle.h" #include "qsizepolicy.h" diff --git a/src/widgets/kernel/qlayoutengine_p.h b/src/widgets/kernel/qlayoutengine_p.h index 0f7d3fdb90..812fa7cf3b 100644 --- a/src/widgets/kernel/qlayoutengine_p.h +++ b/src/widgets/kernel/qlayoutengine_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include "QtWidgets/qlayoutitem.h" #include "QtWidgets/qstyle.h" diff --git a/src/widgets/kernel/qlayoutitem.h b/src/widgets/kernel/qlayoutitem.h index b54a59084b..6f701b9f82 100644 --- a/src/widgets/kernel/qlayoutitem.h +++ b/src/widgets/kernel/qlayoutitem.h @@ -40,6 +40,7 @@ #ifndef QLAYOUTITEM_H #define QLAYOUTITEM_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qsizepolicy.h> #include <QtCore/qrect.h> diff --git a/src/widgets/kernel/qmacgesturerecognizer_p.h b/src/widgets/kernel/qmacgesturerecognizer_p.h index 844d4a6460..be3f3266ac 100644 --- a/src/widgets/kernel/qmacgesturerecognizer_p.h +++ b/src/widgets/kernel/qmacgesturerecognizer_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include "qtimer.h" #include "qpoint.h" #include "qgesturerecognizer.h" diff --git a/src/widgets/kernel/qopenglwidget.h b/src/widgets/kernel/qopenglwidget.h index acbbb24c40..b60d79bedb 100644 --- a/src/widgets/kernel/qopenglwidget.h +++ b/src/widgets/kernel/qopenglwidget.h @@ -40,7 +40,7 @@ #ifndef QOPENGLWIDGET_H #define QOPENGLWIDGET_H -#include <QtCore/qglobal.h> +#include <QtWidgets/qtwidgetsglobal.h> #ifndef QT_NO_OPENGL diff --git a/src/widgets/kernel/qshortcut.h b/src/widgets/kernel/qshortcut.h index c3ccbe3c08..22c667c9c1 100644 --- a/src/widgets/kernel/qshortcut.h +++ b/src/widgets/kernel/qshortcut.h @@ -40,6 +40,7 @@ #ifndef QSHORTCUT_H #define QSHORTCUT_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qwidget.h> #include <QtGui/qkeysequence.h> diff --git a/src/widgets/kernel/qsizepolicy.h b/src/widgets/kernel/qsizepolicy.h index 7a1e22fdc2..63b578fbf3 100644 --- a/src/widgets/kernel/qsizepolicy.h +++ b/src/widgets/kernel/qsizepolicy.h @@ -40,6 +40,7 @@ #ifndef QSIZEPOLICY_H #define QSIZEPOLICY_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtCore/qobject.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/kernel/qstackedlayout.h b/src/widgets/kernel/qstackedlayout.h index fb83fddc43..6f5eded1f0 100644 --- a/src/widgets/kernel/qstackedlayout.h +++ b/src/widgets/kernel/qstackedlayout.h @@ -40,6 +40,7 @@ #ifndef QSTACKEDLAYOUT_H #define QSTACKEDLAYOUT_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qlayout.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/kernel/qstandardgestures_p.h b/src/widgets/kernel/qstandardgestures_p.h index abda1a3f6e..9b2cffaa9a 100644 --- a/src/widgets/kernel/qstandardgestures_p.h +++ b/src/widgets/kernel/qstandardgestures_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include "qgesturerecognizer.h" #include "private/qgesture_p.h" diff --git a/src/widgets/kernel/qt_widgets_pch.h b/src/widgets/kernel/qt_widgets_pch.h index f58a8895eb..f30202d89e 100644 --- a/src/widgets/kernel/qt_widgets_pch.h +++ b/src/widgets/kernel/qt_widgets_pch.h @@ -47,7 +47,7 @@ // from corelib/global/qt_pch.h #if defined __cplusplus -#include <qglobal.h> +#include <qtwidgetsglobal.h> #ifdef Q_DEAD_CODE_FROM_QT4_WIN diff --git a/src/widgets/kernel/qtooltip.h b/src/widgets/kernel/qtooltip.h index aad6e941c8..5e68eef0a7 100644 --- a/src/widgets/kernel/qtooltip.h +++ b/src/widgets/kernel/qtooltip.h @@ -40,6 +40,7 @@ #ifndef QTOOLTIP_H #define QTOOLTIP_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qwidget.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/kernel/qtwidgetsglobal.h b/src/widgets/kernel/qtwidgetsglobal.h new file mode 100644 index 0000000000..f6d003e629 --- /dev/null +++ b/src/widgets/kernel/qtwidgetsglobal.h @@ -0,0 +1,59 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the QtWidgets module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QTWIDGETSGLOBAL_H +#define QTWIDGETSGLOBAL_H + +#include <QtGui/qtguiglobal.h> + +QT_BEGIN_NAMESPACE + +#ifndef QT_STATIC +# 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_WIDGETS_EXPORT +#endif + +QT_END_NAMESPACE + +#endif // QTGUIGLOBAL_H diff --git a/src/widgets/kernel/qtwidgetsglobal_p.h b/src/widgets/kernel/qtwidgetsglobal_p.h new file mode 100644 index 0000000000..7dd545415c --- /dev/null +++ b/src/widgets/kernel/qtwidgetsglobal_p.h @@ -0,0 +1,57 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the QtWidgets module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QTWIDGETSGLOBAL_P_H +#define QTWIDGETSGLOBAL_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include <QtWidgets/qtwidgetsglobal.h> +#include <QtGui/private/qtguiglobal_p.h> + +#endif // QTWIDGETSGLOBAL_P_H diff --git a/src/widgets/kernel/qwhatsthis.h b/src/widgets/kernel/qwhatsthis.h index 0889653e2c..746fd3ff22 100644 --- a/src/widgets/kernel/qwhatsthis.h +++ b/src/widgets/kernel/qwhatsthis.h @@ -40,6 +40,7 @@ #ifndef QWHATSTHIS_H #define QWHATSTHIS_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtCore/qobject.h> #include <QtGui/qcursor.h> diff --git a/src/widgets/kernel/qwidget.h b/src/widgets/kernel/qwidget.h index 43ca76ac7c..2a71710143 100644 --- a/src/widgets/kernel/qwidget.h +++ b/src/widgets/kernel/qwidget.h @@ -40,6 +40,7 @@ #ifndef QWIDGET_H #define QWIDGET_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtGui/qwindowdefs.h> #include <QtCore/qobject.h> #include <QtCore/qmargins.h> diff --git a/src/widgets/kernel/qwidget_p.h b/src/widgets/kernel/qwidget_p.h index 71691a4afa..f2884e7b17 100644 --- a/src/widgets/kernel/qwidget_p.h +++ b/src/widgets/kernel/qwidget_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include "QtWidgets/qwidget.h" #include "private/qobject_p.h" #include "QtCore/qrect.h" diff --git a/src/widgets/kernel/qwidgetaction.h b/src/widgets/kernel/qwidgetaction.h index 4adb9b61ea..3da691a430 100644 --- a/src/widgets/kernel/qwidgetaction.h +++ b/src/widgets/kernel/qwidgetaction.h @@ -40,6 +40,7 @@ #ifndef QWIDGETACTION_H #define QWIDGETACTION_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qaction.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/kernel/qwidgetaction_p.h b/src/widgets/kernel/qwidgetaction_p.h index 20da855185..1fbcf236a1 100644 --- a/src/widgets/kernel/qwidgetaction_p.h +++ b/src/widgets/kernel/qwidgetaction_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include "private/qaction_p.h" QT_BEGIN_NAMESPACE diff --git a/src/widgets/kernel/qwidgetbackingstore_p.h b/src/widgets/kernel/qwidgetbackingstore_p.h index dc20446047..16b36423a6 100644 --- a/src/widgets/kernel/qwidgetbackingstore_p.h +++ b/src/widgets/kernel/qwidgetbackingstore_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include <QDebug> #include <QtWidgets/qwidget.h> #include <private/qwidget_p.h> diff --git a/src/widgets/kernel/qwidgetwindow_p.h b/src/widgets/kernel/qwidgetwindow_p.h index a0d79b2b72..edf2383596 100644 --- a/src/widgets/kernel/qwidgetwindow_p.h +++ b/src/widgets/kernel/qwidgetwindow_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include <QtGui/qwindow.h> #include <QtCore/private/qobject_p.h> diff --git a/src/widgets/kernel/qwindowcontainer_p.h b/src/widgets/kernel/qwindowcontainer_p.h index 557a56169e..1d838c8dd6 100644 --- a/src/widgets/kernel/qwindowcontainer_p.h +++ b/src/widgets/kernel/qwindowcontainer_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include <QtWidgets/qwidget.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/statemachine/qbasickeyeventtransition_p.h b/src/widgets/statemachine/qbasickeyeventtransition_p.h index 0af3ce8051..576c5beb5d 100644 --- a/src/widgets/statemachine/qbasickeyeventtransition_p.h +++ b/src/widgets/statemachine/qbasickeyeventtransition_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include <QtCore/qabstracttransition.h> #ifndef QT_NO_STATEMACHINE diff --git a/src/widgets/statemachine/qbasicmouseeventtransition_p.h b/src/widgets/statemachine/qbasicmouseeventtransition_p.h index a9f7999355..72320a52dc 100644 --- a/src/widgets/statemachine/qbasicmouseeventtransition_p.h +++ b/src/widgets/statemachine/qbasicmouseeventtransition_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include <QtCore/qabstracttransition.h> #ifndef QT_NO_STATEMACHINE diff --git a/src/widgets/statemachine/qkeyeventtransition.h b/src/widgets/statemachine/qkeyeventtransition.h index dc62f7909d..1e3f02acd8 100644 --- a/src/widgets/statemachine/qkeyeventtransition.h +++ b/src/widgets/statemachine/qkeyeventtransition.h @@ -40,6 +40,7 @@ #ifndef QKEYEVENTTRANSITION_H #define QKEYEVENTTRANSITION_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtCore/qeventtransition.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/statemachine/qmouseeventtransition.h b/src/widgets/statemachine/qmouseeventtransition.h index f9e9ba7a21..43185b140d 100644 --- a/src/widgets/statemachine/qmouseeventtransition.h +++ b/src/widgets/statemachine/qmouseeventtransition.h @@ -40,6 +40,7 @@ #ifndef QMOUSEEVENTTRANSITION_H #define QMOUSEEVENTTRANSITION_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtCore/qeventtransition.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/styles/qandroidstyle_p.h b/src/widgets/styles/qandroidstyle_p.h index 0c9d2469f0..4649d90852 100644 --- a/src/widgets/styles/qandroidstyle_p.h +++ b/src/widgets/styles/qandroidstyle_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include <QtCore/QList> #include <QtCore/QMargins> #include <QtCore/QHash> diff --git a/src/widgets/styles/qcommonstyle.h b/src/widgets/styles/qcommonstyle.h index 9eb1c548bd..ed880a150f 100644 --- a/src/widgets/styles/qcommonstyle.h +++ b/src/widgets/styles/qcommonstyle.h @@ -40,6 +40,7 @@ #ifndef QCOMMONSTYLE_H #define QCOMMONSTYLE_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qstyle.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/styles/qcommonstyle_p.h b/src/widgets/styles/qcommonstyle_p.h index 031789fc5f..2ef7f30d21 100644 --- a/src/widgets/styles/qcommonstyle_p.h +++ b/src/widgets/styles/qcommonstyle_p.h @@ -40,6 +40,7 @@ #ifndef QCOMMONSTYLE_P_H #define QCOMMONSTYLE_P_H +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include "qcommonstyle.h" #include "qstyle_p.h" #include "qstyleanimation_p.h" diff --git a/src/widgets/styles/qcommonstylepixmaps_p.h b/src/widgets/styles/qcommonstylepixmaps_p.h index 8842bc8b76..58b979465a 100644 --- a/src/widgets/styles/qcommonstylepixmaps_p.h +++ b/src/widgets/styles/qcommonstylepixmaps_p.h @@ -37,7 +37,7 @@ ** ****************************************************************************/ -#include <QtCore/qglobal.h> +#include <QtWidgets/private/qtwidgetsglobal_p.h> #ifndef QT_NO_IMAGEFORMAT_XPM diff --git a/src/widgets/styles/qdrawutil.h b/src/widgets/styles/qdrawutil.h index adb4478bc9..121221dfc9 100644 --- a/src/widgets/styles/qdrawutil.h +++ b/src/widgets/styles/qdrawutil.h @@ -40,6 +40,7 @@ #ifndef QDRAWUTIL_H #define QDRAWUTIL_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtCore/qnamespace.h> #include <QtCore/qstring.h> // char*->QString conversion #include <QtCore/qmargins.h> diff --git a/src/widgets/styles/qfusionstyle_p.h b/src/widgets/styles/qfusionstyle_p.h index c836b9e193..126fb96e78 100644 --- a/src/widgets/styles/qfusionstyle_p.h +++ b/src/widgets/styles/qfusionstyle_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include <QtWidgets/qcommonstyle.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/styles/qfusionstyle_p_p.h b/src/widgets/styles/qfusionstyle_p_p.h index e45055f2c2..8d1d27d244 100644 --- a/src/widgets/styles/qfusionstyle_p_p.h +++ b/src/widgets/styles/qfusionstyle_p_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include "qcommonstyle.h" #include "qcommonstyle_p.h" #include <qpa/qplatformtheme.h> diff --git a/src/widgets/styles/qmacstyle_mac_p.h b/src/widgets/styles/qmacstyle_mac_p.h index 7ff3d25952..fdc22794b4 100644 --- a/src/widgets/styles/qmacstyle_mac_p.h +++ b/src/widgets/styles/qmacstyle_mac_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include <QtWidgets/qcommonstyle.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/styles/qmacstyle_mac_p_p.h b/src/widgets/styles/qmacstyle_mac_p_p.h index 31ba8c3464..798f6ed90b 100644 --- a/src/widgets/styles/qmacstyle_mac_p_p.h +++ b/src/widgets/styles/qmacstyle_mac_p_p.h @@ -44,6 +44,7 @@ #include <Carbon/Carbon.h> #undef check +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include "qmacstyle_mac_p.h" #include "qcommonstyle_p.h" #include <private/qapplication_p.h> diff --git a/src/widgets/styles/qpixmapstyle_p.h b/src/widgets/styles/qpixmapstyle_p.h index 4255cba2de..618d6d2f50 100644 --- a/src/widgets/styles/qpixmapstyle_p.h +++ b/src/widgets/styles/qpixmapstyle_p.h @@ -42,6 +42,7 @@ #ifndef QPIXMAPSTYLE_H #define QPIXMAPSTYLE_H +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include <QtWidgets/QCommonStyle> #include <QtWidgets/QTileRules> diff --git a/src/widgets/styles/qpixmapstyle_p_p.h b/src/widgets/styles/qpixmapstyle_p_p.h index 3400729c4c..481262d5c5 100644 --- a/src/widgets/styles/qpixmapstyle_p_p.h +++ b/src/widgets/styles/qpixmapstyle_p_p.h @@ -40,6 +40,7 @@ #ifndef QPIXMAPSTYLE_P_H #define QPIXMAPSTYLE_P_H +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include "qpixmapstyle_p.h" #include "qcommonstyle_p.h" diff --git a/src/widgets/styles/qproxystyle.h b/src/widgets/styles/qproxystyle.h index d98155d249..20a0f12868 100644 --- a/src/widgets/styles/qproxystyle.h +++ b/src/widgets/styles/qproxystyle.h @@ -40,6 +40,7 @@ #ifndef QPROXYSTYLE_H #define QPROXYSTYLE_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/QCommonStyle> QT_BEGIN_NAMESPACE diff --git a/src/widgets/styles/qproxystyle_p.h b/src/widgets/styles/qproxystyle_p.h index 3ec12d4634..2343a03e2a 100644 --- a/src/widgets/styles/qproxystyle_p.h +++ b/src/widgets/styles/qproxystyle_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include "qcommonstyle.h" #include "qcommonstyle_p.h" #include "qproxystyle.h" diff --git a/src/widgets/styles/qstyle.h b/src/widgets/styles/qstyle.h index 0c8805e7a5..ce33dbed62 100644 --- a/src/widgets/styles/qstyle.h +++ b/src/widgets/styles/qstyle.h @@ -40,6 +40,7 @@ #ifndef QSTYLE_H #define QSTYLE_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtCore/qobject.h> #include <QtCore/qrect.h> #include <QtCore/qsize.h> diff --git a/src/widgets/styles/qstyleanimation_p.h b/src/widgets/styles/qstyleanimation_p.h index ed802a450e..3b10eeea27 100644 --- a/src/widgets/styles/qstyleanimation_p.h +++ b/src/widgets/styles/qstyleanimation_p.h @@ -40,6 +40,7 @@ #ifndef QSTYLEANIMATION_P_H #define QSTYLEANIMATION_P_H +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include "qabstractanimation.h" #include "qdatetime.h" #include "qimage.h" diff --git a/src/widgets/styles/qstylefactory.h b/src/widgets/styles/qstylefactory.h index c5393c3a66..50c3750b6c 100644 --- a/src/widgets/styles/qstylefactory.h +++ b/src/widgets/styles/qstylefactory.h @@ -40,6 +40,7 @@ #ifndef QSTYLEFACTORY_H #define QSTYLEFACTORY_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtCore/qstringlist.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/styles/qstylehelper_p.h b/src/widgets/styles/qstylehelper_p.h index b00b873731..88eb05f1d7 100644 --- a/src/widgets/styles/qstylehelper_p.h +++ b/src/widgets/styles/qstylehelper_p.h @@ -37,7 +37,7 @@ ** ****************************************************************************/ -#include <QtCore/qglobal.h> +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include <QtCore/qpoint.h> #include <QtCore/qstring.h> #include <QtGui/qpolygon.h> diff --git a/src/widgets/styles/qstyleoption.h b/src/widgets/styles/qstyleoption.h index b03e2cc860..896024f73a 100644 --- a/src/widgets/styles/qstyleoption.h +++ b/src/widgets/styles/qstyleoption.h @@ -40,6 +40,7 @@ #ifndef QSTYLEOPTION_H #define QSTYLEOPTION_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtCore/qvariant.h> #include <QtWidgets/qabstractspinbox.h> #include <QtGui/qicon.h> diff --git a/src/widgets/styles/qstylepainter.h b/src/widgets/styles/qstylepainter.h index 27d4c43550..191360727e 100644 --- a/src/widgets/styles/qstylepainter.h +++ b/src/widgets/styles/qstylepainter.h @@ -40,6 +40,7 @@ #ifndef QSTYLEPAINTER_H #define QSTYLEPAINTER_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtGui/qpainter.h> #include <QtWidgets/qstyle.h> #include <QtWidgets/qwidget.h> diff --git a/src/widgets/styles/qstyleplugin.h b/src/widgets/styles/qstyleplugin.h index 72dfa8b6ed..d44f57d208 100644 --- a/src/widgets/styles/qstyleplugin.h +++ b/src/widgets/styles/qstyleplugin.h @@ -40,6 +40,7 @@ #ifndef QSTYLEPLUGIN_H #define QSTYLEPLUGIN_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtCore/qplugin.h> #include <QtCore/qfactoryinterface.h> diff --git a/src/widgets/styles/qstylesheetstyle_p.h b/src/widgets/styles/qstylesheetstyle_p.h index 80bac0c789..55dd2df329 100644 --- a/src/widgets/styles/qstylesheetstyle_p.h +++ b/src/widgets/styles/qstylesheetstyle_p.h @@ -40,6 +40,7 @@ #ifndef QSTYLESHEETSTYLE_P_H #define QSTYLESHEETSTYLE_P_H +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include "private/qwindowsstyle_p.h" #ifndef QT_NO_STYLE_STYLESHEET diff --git a/src/widgets/styles/qwindowsstyle_p.h b/src/widgets/styles/qwindowsstyle_p.h index f9d174d3c6..5d68bfeba0 100644 --- a/src/widgets/styles/qwindowsstyle_p.h +++ b/src/widgets/styles/qwindowsstyle_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include <QtWidgets/qcommonstyle.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/styles/qwindowsstyle_p_p.h b/src/widgets/styles/qwindowsstyle_p_p.h index e6c44f401e..b6a2df9cfc 100644 --- a/src/widgets/styles/qwindowsstyle_p_p.h +++ b/src/widgets/styles/qwindowsstyle_p_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include "qwindowsstyle_p.h" #include "qcommonstyle_p.h" diff --git a/src/widgets/styles/qwindowsvistastyle_p.h b/src/widgets/styles/qwindowsvistastyle_p.h index 406051f227..0289f404dd 100644 --- a/src/widgets/styles/qwindowsvistastyle_p.h +++ b/src/widgets/styles/qwindowsvistastyle_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include <private/qwindowsxpstyle_p.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/styles/qwindowsvistastyle_p_p.h b/src/widgets/styles/qwindowsvistastyle_p_p.h index e207a27a66..4ca47fec2c 100644 --- a/src/widgets/styles/qwindowsvistastyle_p_p.h +++ b/src/widgets/styles/qwindowsvistastyle_p_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include "qwindowsvistastyle_p.h" #if !defined(QT_NO_STYLE_WINDOWSVISTA) diff --git a/src/widgets/styles/qwindowsxpstyle_p.h b/src/widgets/styles/qwindowsxpstyle_p.h index 61bb508511..088178cb5a 100644 --- a/src/widgets/styles/qwindowsxpstyle_p.h +++ b/src/widgets/styles/qwindowsxpstyle_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include <private/qwindowsstyle_p.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/styles/qwindowsxpstyle_p_p.h b/src/widgets/styles/qwindowsxpstyle_p_p.h index 91d60c8e82..7cbccdaf67 100644 --- a/src/widgets/styles/qwindowsxpstyle_p_p.h +++ b/src/widgets/styles/qwindowsxpstyle_p_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include "qwindowsxpstyle_p.h" #include "qwindowsstyle_p_p.h" #include <qmap.h> diff --git a/src/widgets/util/qcolormap.h b/src/widgets/util/qcolormap.h index 0c752d4a22..8e652d8154 100644 --- a/src/widgets/util/qcolormap.h +++ b/src/widgets/util/qcolormap.h @@ -40,6 +40,7 @@ #ifndef QCOLORMAP_H #define QCOLORMAP_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtCore/qatomic.h> #include <QtGui/qrgb.h> #include <QtCore/qvector.h> diff --git a/src/widgets/util/qcompleter.h b/src/widgets/util/qcompleter.h index 435639be99..33e6540264 100644 --- a/src/widgets/util/qcompleter.h +++ b/src/widgets/util/qcompleter.h @@ -40,6 +40,7 @@ #ifndef QCOMPLETER_H #define QCOMPLETER_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtCore/qobject.h> #include <QtCore/qpoint.h> #include <QtCore/qstring.h> diff --git a/src/widgets/util/qcompleter_p.h b/src/widgets/util/qcompleter_p.h index 10dde975c0..c35f70b451 100644 --- a/src/widgets/util/qcompleter_p.h +++ b/src/widgets/util/qcompleter_p.h @@ -52,6 +52,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include "private/qobject_p.h" #ifndef QT_NO_COMPLETER diff --git a/src/widgets/util/qflickgesture_p.h b/src/widgets/util/qflickgesture_p.h index 1b82a314ee..fa70806ef7 100644 --- a/src/widgets/util/qflickgesture_p.h +++ b/src/widgets/util/qflickgesture_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include "qevent.h" #include "qgesturerecognizer.h" #include "private/qgesture_p.h" diff --git a/src/widgets/util/qscroller.h b/src/widgets/util/qscroller.h index 1e017a2410..561dcfaefc 100644 --- a/src/widgets/util/qscroller.h +++ b/src/widgets/util/qscroller.h @@ -40,6 +40,7 @@ #ifndef QSCROLLER_H #define QSCROLLER_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtCore/QObject> #include <QtCore/QPointF> #include <QtWidgets/QScrollerProperties> diff --git a/src/widgets/util/qscroller_p.h b/src/widgets/util/qscroller_p.h index 24ad841a91..4557e7cc33 100644 --- a/src/widgets/util/qscroller_p.h +++ b/src/widgets/util/qscroller_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include <QObject> #include <QPointer> #include <QQueue> diff --git a/src/widgets/util/qscrollerproperties.h b/src/widgets/util/qscrollerproperties.h index 67f3d0e15d..4fdc9bd32f 100644 --- a/src/widgets/util/qscrollerproperties.h +++ b/src/widgets/util/qscrollerproperties.h @@ -40,6 +40,7 @@ #ifndef QSCROLLERPROPERTIES_H #define QSCROLLERPROPERTIES_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtCore/QScopedPointer> #include <QtCore/QMetaType> #include <QtCore/QVariant> diff --git a/src/widgets/util/qscrollerproperties_p.h b/src/widgets/util/qscrollerproperties_p.h index d480d8d829..7965171321 100644 --- a/src/widgets/util/qscrollerproperties_p.h +++ b/src/widgets/util/qscrollerproperties_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include <QPointF> #include <QEasingCurve> #include <qscrollerproperties.h> diff --git a/src/widgets/util/qsystemtrayicon.h b/src/widgets/util/qsystemtrayicon.h index 105e25f44e..fb238c92b0 100644 --- a/src/widgets/util/qsystemtrayicon.h +++ b/src/widgets/util/qsystemtrayicon.h @@ -40,6 +40,7 @@ #ifndef QSYSTEMTRAYICON_H #define QSYSTEMTRAYICON_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtCore/qobject.h> #ifndef QT_NO_SYSTEMTRAYICON diff --git a/src/widgets/util/qsystemtrayicon_p.h b/src/widgets/util/qsystemtrayicon_p.h index 396a91eea6..7aca6631cc 100644 --- a/src/widgets/util/qsystemtrayicon_p.h +++ b/src/widgets/util/qsystemtrayicon_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include "qsystemtrayicon.h" #include "private/qobject_p.h" diff --git a/src/widgets/util/qundogroup.h b/src/widgets/util/qundogroup.h index f4243d483e..4e2fdeed26 100644 --- a/src/widgets/util/qundogroup.h +++ b/src/widgets/util/qundogroup.h @@ -40,6 +40,7 @@ #ifndef QUNDOGROUP_H #define QUNDOGROUP_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtCore/qobject.h> #include <QtCore/qstring.h> diff --git a/src/widgets/util/qundostack.h b/src/widgets/util/qundostack.h index fbd8f237ee..f4db78300b 100644 --- a/src/widgets/util/qundostack.h +++ b/src/widgets/util/qundostack.h @@ -40,6 +40,7 @@ #ifndef QUNDOSTACK_H #define QUNDOSTACK_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtCore/qobject.h> #include <QtCore/qstring.h> diff --git a/src/widgets/util/qundostack_p.h b/src/widgets/util/qundostack_p.h index 9bfe527306..1bfe992426 100644 --- a/src/widgets/util/qundostack_p.h +++ b/src/widgets/util/qundostack_p.h @@ -40,6 +40,7 @@ #ifndef QUNDOSTACK_P_H #define QUNDOSTACK_P_H +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include <private/qobject_p.h> #include <QtCore/qlist.h> #include <QtCore/qstring.h> diff --git a/src/widgets/util/qundoview.h b/src/widgets/util/qundoview.h index fab040ba0e..3ed9ea5989 100644 --- a/src/widgets/util/qundoview.h +++ b/src/widgets/util/qundoview.h @@ -40,6 +40,7 @@ #ifndef QUNDOVIEW_H #define QUNDOVIEW_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qlistview.h> #include <QtCore/qstring.h> diff --git a/src/widgets/widgets/qabstractbutton.h b/src/widgets/widgets/qabstractbutton.h index bd18c394f2..7bf0e0b9d6 100644 --- a/src/widgets/widgets/qabstractbutton.h +++ b/src/widgets/widgets/qabstractbutton.h @@ -40,6 +40,7 @@ #ifndef QABSTRACTBUTTON_H #define QABSTRACTBUTTON_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtGui/qicon.h> #include <QtGui/qkeysequence.h> #include <QtWidgets/qwidget.h> diff --git a/src/widgets/widgets/qabstractbutton_p.h b/src/widgets/widgets/qabstractbutton_p.h index f65a0527fc..8f67c0d367 100644 --- a/src/widgets/widgets/qabstractbutton_p.h +++ b/src/widgets/widgets/qabstractbutton_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include "qabstractbutton.h" #include "QtCore/qbasictimer.h" diff --git a/src/widgets/widgets/qabstractscrollarea.h b/src/widgets/widgets/qabstractscrollarea.h index 9f8ea27408..476914b781 100644 --- a/src/widgets/widgets/qabstractscrollarea.h +++ b/src/widgets/widgets/qabstractscrollarea.h @@ -40,6 +40,7 @@ #ifndef QABSTRACTSCROLLAREA_H #define QABSTRACTSCROLLAREA_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qframe.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/widgets/qabstractscrollarea_p.h b/src/widgets/widgets/qabstractscrollarea_p.h index 5239f72ec4..600c834c29 100644 --- a/src/widgets/widgets/qabstractscrollarea_p.h +++ b/src/widgets/widgets/qabstractscrollarea_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include "private/qframe_p.h" #include "qabstractscrollarea.h" diff --git a/src/widgets/widgets/qabstractslider.h b/src/widgets/widgets/qabstractslider.h index 4f8d12fd49..86d6830f10 100644 --- a/src/widgets/widgets/qabstractslider.h +++ b/src/widgets/widgets/qabstractslider.h @@ -40,6 +40,7 @@ #ifndef QABSTRACTSLIDER_H #define QABSTRACTSLIDER_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qwidget.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/widgets/qabstractslider_p.h b/src/widgets/widgets/qabstractslider_p.h index e78cf7a27c..600616061a 100644 --- a/src/widgets/widgets/qabstractslider_p.h +++ b/src/widgets/widgets/qabstractslider_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include "QtCore/qbasictimer.h" #include "QtCore/qelapsedtimer.h" #include "private/qwidget_p.h" diff --git a/src/widgets/widgets/qabstractspinbox.h b/src/widgets/widgets/qabstractspinbox.h index 8d31c1f503..d93489e663 100644 --- a/src/widgets/widgets/qabstractspinbox.h +++ b/src/widgets/widgets/qabstractspinbox.h @@ -40,6 +40,7 @@ #ifndef QABSTRACTSPINBOX_H #define QABSTRACTSPINBOX_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qwidget.h> #include <QtGui/qvalidator.h> diff --git a/src/widgets/widgets/qabstractspinbox_p.h b/src/widgets/widgets/qabstractspinbox_p.h index a54659ecaa..47ca10a183 100644 --- a/src/widgets/widgets/qabstractspinbox_p.h +++ b/src/widgets/widgets/qabstractspinbox_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include "QtWidgets/qabstractspinbox.h" #ifndef QT_NO_SPINBOX diff --git a/src/widgets/widgets/qbuttongroup.h b/src/widgets/widgets/qbuttongroup.h index 58da20540f..ff931b1ee0 100644 --- a/src/widgets/widgets/qbuttongroup.h +++ b/src/widgets/widgets/qbuttongroup.h @@ -40,6 +40,7 @@ #ifndef QBUTTONGROUP_H #define QBUTTONGROUP_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtCore/qobject.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/widgets/qbuttongroup_p.h b/src/widgets/widgets/qbuttongroup_p.h index 95a72eb4fd..b94dd170b4 100644 --- a/src/widgets/widgets/qbuttongroup_p.h +++ b/src/widgets/widgets/qbuttongroup_p.h @@ -45,6 +45,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include <QtWidgets/qbuttongroup.h> #ifndef QT_NO_BUTTONGROUP diff --git a/src/widgets/widgets/qcalendarwidget.h b/src/widgets/widgets/qcalendarwidget.h index ef473cba94..7780065117 100644 --- a/src/widgets/widgets/qcalendarwidget.h +++ b/src/widgets/widgets/qcalendarwidget.h @@ -40,6 +40,7 @@ #ifndef QCALENDARWIDGET_H #define QCALENDARWIDGET_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qwidget.h> #include <QtCore/qdatetime.h> diff --git a/src/widgets/widgets/qcheckbox.h b/src/widgets/widgets/qcheckbox.h index 70aac38488..22f26b6667 100644 --- a/src/widgets/widgets/qcheckbox.h +++ b/src/widgets/widgets/qcheckbox.h @@ -40,6 +40,7 @@ #ifndef QCHECKBOX_H #define QCHECKBOX_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qabstractbutton.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/widgets/qcombobox.h b/src/widgets/widgets/qcombobox.h index 095a06fe31..2da1ceb047 100644 --- a/src/widgets/widgets/qcombobox.h +++ b/src/widgets/widgets/qcombobox.h @@ -40,6 +40,7 @@ #ifndef QCOMBOBOX_H #define QCOMBOBOX_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qwidget.h> #include <QtWidgets/qabstractitemdelegate.h> #include <QtCore/qabstractitemmodel.h> diff --git a/src/widgets/widgets/qcombobox_p.h b/src/widgets/widgets/qcombobox_p.h index 3c92b09e9a..7ca077abf9 100644 --- a/src/widgets/widgets/qcombobox_p.h +++ b/src/widgets/widgets/qcombobox_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include "QtWidgets/qcombobox.h" #ifndef QT_NO_COMBOBOX diff --git a/src/widgets/widgets/qcommandlinkbutton.h b/src/widgets/widgets/qcommandlinkbutton.h index c794b60506..4f81651ce4 100644 --- a/src/widgets/widgets/qcommandlinkbutton.h +++ b/src/widgets/widgets/qcommandlinkbutton.h @@ -40,6 +40,7 @@ #ifndef QCOMMANDLINKBUTTON_H #define QCOMMANDLINKBUTTON_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qpushbutton.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/widgets/qdatetimeedit.h b/src/widgets/widgets/qdatetimeedit.h index f050061dea..c261ce369b 100644 --- a/src/widgets/widgets/qdatetimeedit.h +++ b/src/widgets/widgets/qdatetimeedit.h @@ -40,6 +40,7 @@ #ifndef QDATETIMEEDIT_H #define QDATETIMEEDIT_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtCore/qdatetime.h> #include <QtCore/qvariant.h> #include <QtWidgets/qabstractspinbox.h> diff --git a/src/widgets/widgets/qdatetimeedit_p.h b/src/widgets/widgets/qdatetimeedit_p.h index be7bc213a2..6889bda041 100644 --- a/src/widgets/widgets/qdatetimeedit_p.h +++ b/src/widgets/widgets/qdatetimeedit_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include "QtWidgets/qcombobox.h" #include "QtWidgets/qcalendarwidget.h" #include "QtWidgets/qspinbox.h" diff --git a/src/widgets/widgets/qdial.h b/src/widgets/widgets/qdial.h index 7884d9fe27..3629ebf8f6 100644 --- a/src/widgets/widgets/qdial.h +++ b/src/widgets/widgets/qdial.h @@ -41,6 +41,7 @@ #ifndef QDIAL_H #define QDIAL_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qabstractslider.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/widgets/qdialogbuttonbox.h b/src/widgets/widgets/qdialogbuttonbox.h index dfec453c67..699547c32f 100644 --- a/src/widgets/widgets/qdialogbuttonbox.h +++ b/src/widgets/widgets/qdialogbuttonbox.h @@ -40,6 +40,7 @@ #ifndef QDIALOGBUTTONBOX_H #define QDIALOGBUTTONBOX_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qwidget.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/widgets/qdockarealayout_p.h b/src/widgets/widgets/qdockarealayout_p.h index 591b156902..aa6e4232e0 100644 --- a/src/widgets/widgets/qdockarealayout_p.h +++ b/src/widgets/widgets/qdockarealayout_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include "QtCore/qrect.h" #include "QtCore/qpair.h" #include "QtCore/qlist.h" diff --git a/src/widgets/widgets/qdockwidget.h b/src/widgets/widgets/qdockwidget.h index e0aaf54d0e..7b3f8d0ddb 100644 --- a/src/widgets/widgets/qdockwidget.h +++ b/src/widgets/widgets/qdockwidget.h @@ -40,6 +40,7 @@ #ifndef QDYNAMICDOCKWIDGET_H #define QDYNAMICDOCKWIDGET_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qwidget.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/widgets/qdockwidget_p.h b/src/widgets/widgets/qdockwidget_p.h index 765747b101..94a3ad3b34 100644 --- a/src/widgets/widgets/qdockwidget_p.h +++ b/src/widgets/widgets/qdockwidget_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include "QtWidgets/qstyleoption.h" #include "private/qwidget_p.h" #include "QtWidgets/qboxlayout.h" diff --git a/src/widgets/widgets/qfocusframe.h b/src/widgets/widgets/qfocusframe.h index a1b2032e05..a1fc6d345d 100644 --- a/src/widgets/widgets/qfocusframe.h +++ b/src/widgets/widgets/qfocusframe.h @@ -40,6 +40,7 @@ #ifndef QFOCUSFRAME_H #define QFOCUSFRAME_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qwidget.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/widgets/qfontcombobox.h b/src/widgets/widgets/qfontcombobox.h index 0db077cd87..c409d33fef 100644 --- a/src/widgets/widgets/qfontcombobox.h +++ b/src/widgets/widgets/qfontcombobox.h @@ -40,6 +40,7 @@ #ifndef QFONTCOMBOBOX_H #define QFONTCOMBOBOX_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qcombobox.h> #include <QtGui/qfontdatabase.h> diff --git a/src/widgets/widgets/qframe.h b/src/widgets/widgets/qframe.h index e38ec60d42..986915a28f 100644 --- a/src/widgets/widgets/qframe.h +++ b/src/widgets/widgets/qframe.h @@ -40,6 +40,7 @@ #ifndef QFRAME_H #define QFRAME_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qwidget.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/widgets/qframe_p.h b/src/widgets/widgets/qframe_p.h index 54d2ba869d..e3c101e87c 100644 --- a/src/widgets/widgets/qframe_p.h +++ b/src/widgets/widgets/qframe_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include "private/qwidget_p.h" #include "qframe.h" diff --git a/src/widgets/widgets/qgroupbox.h b/src/widgets/widgets/qgroupbox.h index 0bff3aa6f9..a132d48e16 100644 --- a/src/widgets/widgets/qgroupbox.h +++ b/src/widgets/widgets/qgroupbox.h @@ -40,6 +40,7 @@ #ifndef QGROUPBOX_H #define QGROUPBOX_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qframe.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/widgets/qkeysequenceedit.h b/src/widgets/widgets/qkeysequenceedit.h index 85a2177d32..81339a9852 100644 --- a/src/widgets/widgets/qkeysequenceedit.h +++ b/src/widgets/widgets/qkeysequenceedit.h @@ -41,6 +41,7 @@ #ifndef QKEYSEQUENCEEDIT_H #define QKEYSEQUENCEEDIT_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qwidget.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/widgets/qkeysequenceedit_p.h b/src/widgets/widgets/qkeysequenceedit_p.h index a85530645c..67e60b4032 100644 --- a/src/widgets/widgets/qkeysequenceedit_p.h +++ b/src/widgets/widgets/qkeysequenceedit_p.h @@ -52,6 +52,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include "qkeysequenceedit.h" #include <private/qwidget_p.h> diff --git a/src/widgets/widgets/qlabel.h b/src/widgets/widgets/qlabel.h index 46a2ce8ee4..1f76937a63 100644 --- a/src/widgets/widgets/qlabel.h +++ b/src/widgets/widgets/qlabel.h @@ -40,6 +40,7 @@ #ifndef QLABEL_H #define QLABEL_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qframe.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/widgets/qlabel_p.h b/src/widgets/widgets/qlabel_p.h index dce9ba7168..d13c05fc99 100644 --- a/src/widgets/widgets/qlabel_p.h +++ b/src/widgets/widgets/qlabel_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include "qlabel.h" #include "private/qtextdocumentlayout_p.h" diff --git a/src/widgets/widgets/qlcdnumber.h b/src/widgets/widgets/qlcdnumber.h index 1169862193..33669fa900 100644 --- a/src/widgets/widgets/qlcdnumber.h +++ b/src/widgets/widgets/qlcdnumber.h @@ -40,6 +40,7 @@ #ifndef QLCDNUMBER_H #define QLCDNUMBER_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qframe.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/widgets/qlineedit.h b/src/widgets/widgets/qlineedit.h index 12fd998c45..1bdcfaf848 100644 --- a/src/widgets/widgets/qlineedit.h +++ b/src/widgets/widgets/qlineedit.h @@ -40,6 +40,7 @@ #ifndef QLINEEDIT_H #define QLINEEDIT_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qframe.h> #include <QtGui/qtextcursor.h> #include <QtCore/qstring.h> diff --git a/src/widgets/widgets/qlineedit_p.h b/src/widgets/widgets/qlineedit_p.h index a14cd66398..0a08aefab3 100644 --- a/src/widgets/widgets/qlineedit_p.h +++ b/src/widgets/widgets/qlineedit_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include "QtCore/qglobal.h" +#include <QtWidgets/private/qtwidgetsglobal_p.h> #ifndef QT_NO_LINEEDIT #include "private/qwidget_p.h" diff --git a/src/widgets/widgets/qmaccocoaviewcontainer_mac.h b/src/widgets/widgets/qmaccocoaviewcontainer_mac.h index c53cc643cd..d926ef8569 100644 --- a/src/widgets/widgets/qmaccocoaviewcontainer_mac.h +++ b/src/widgets/widgets/qmaccocoaviewcontainer_mac.h @@ -40,6 +40,7 @@ #ifndef QCOCOAVIEWCONTAINER_H #define QCOCOAVIEWCONTAINER_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/QWidget> Q_FORWARD_DECLARE_OBJC_CLASS(NSView); diff --git a/src/widgets/widgets/qmacnativewidget_mac.h b/src/widgets/widgets/qmacnativewidget_mac.h index 559f15f287..44e793f174 100644 --- a/src/widgets/widgets/qmacnativewidget_mac.h +++ b/src/widgets/widgets/qmacnativewidget_mac.h @@ -40,6 +40,7 @@ #ifndef QMACNATIVEWIDGET_H #define QMACNATIVEWIDGET_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/QWidget> Q_FORWARD_DECLARE_OBJC_CLASS(NSView); diff --git a/src/widgets/widgets/qmainwindow.h b/src/widgets/widgets/qmainwindow.h index 4622d89e4c..9bd7eb1cd8 100644 --- a/src/widgets/widgets/qmainwindow.h +++ b/src/widgets/widgets/qmainwindow.h @@ -40,6 +40,7 @@ #ifndef QDYNAMICMAINWINDOW_H #define QDYNAMICMAINWINDOW_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qwidget.h> #include <QtWidgets/qtabwidget.h> diff --git a/src/widgets/widgets/qmainwindowlayout_p.h b/src/widgets/widgets/qmainwindowlayout_p.h index 4c61374d83..7f35f78111 100644 --- a/src/widgets/widgets/qmainwindowlayout_p.h +++ b/src/widgets/widgets/qmainwindowlayout_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include "qmainwindow.h" #ifndef QT_NO_MAINWINDOW diff --git a/src/widgets/widgets/qmdiarea.h b/src/widgets/widgets/qmdiarea.h index b093c4bb4b..44a40948af 100644 --- a/src/widgets/widgets/qmdiarea.h +++ b/src/widgets/widgets/qmdiarea.h @@ -40,6 +40,7 @@ #ifndef QMDIAREA_H #define QMDIAREA_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qabstractscrollarea.h> #include <QtWidgets/qtabwidget.h> diff --git a/src/widgets/widgets/qmdiarea_p.h b/src/widgets/widgets/qmdiarea_p.h index dde7b1a7ce..353144a6ab 100644 --- a/src/widgets/widgets/qmdiarea_p.h +++ b/src/widgets/widgets/qmdiarea_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include "qmdiarea.h" #include "qmdisubwindow.h" diff --git a/src/widgets/widgets/qmdisubwindow.h b/src/widgets/widgets/qmdisubwindow.h index 54ef33befa..e2bb533ddf 100644 --- a/src/widgets/widgets/qmdisubwindow.h +++ b/src/widgets/widgets/qmdisubwindow.h @@ -40,6 +40,7 @@ #ifndef QMDISUBWINDOW_H #define QMDISUBWINDOW_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qwidget.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/widgets/qmdisubwindow_p.h b/src/widgets/widgets/qmdisubwindow_p.h index 4faf421a92..46a8e99d0a 100644 --- a/src/widgets/widgets/qmdisubwindow_p.h +++ b/src/widgets/widgets/qmdisubwindow_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include "qmdisubwindow.h" #ifndef QT_NO_MDIAREA diff --git a/src/widgets/widgets/qmenu.h b/src/widgets/widgets/qmenu.h index fd931e3d5b..bcbd0a95c4 100644 --- a/src/widgets/widgets/qmenu.h +++ b/src/widgets/widgets/qmenu.h @@ -40,6 +40,7 @@ #ifndef QMENU_H #define QMENU_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qwidget.h> #include <QtCore/qstring.h> #include <QtGui/qicon.h> diff --git a/src/widgets/widgets/qmenu_p.h b/src/widgets/widgets/qmenu_p.h index 3ad7c3c7c5..dbc0958f03 100644 --- a/src/widgets/widgets/qmenu_p.h +++ b/src/widgets/widgets/qmenu_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include "QtWidgets/qmenubar.h" #include "QtWidgets/qstyleoption.h" #include "QtCore/qdatetime.h" diff --git a/src/widgets/widgets/qmenubar.h b/src/widgets/widgets/qmenubar.h index 404bd13332..ec15155710 100644 --- a/src/widgets/widgets/qmenubar.h +++ b/src/widgets/widgets/qmenubar.h @@ -40,6 +40,7 @@ #ifndef QMENUBAR_H #define QMENUBAR_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qmenu.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/widgets/qmenubar_p.h b/src/widgets/widgets/qmenubar_p.h index 0db986bac5..153df35297 100644 --- a/src/widgets/widgets/qmenubar_p.h +++ b/src/widgets/widgets/qmenubar_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include "QtWidgets/qstyleoption.h" #include <private/qmenu_p.h> // Mac needs what in this file! #include <qpa/qplatformmenu.h> diff --git a/src/widgets/widgets/qplaintextedit.h b/src/widgets/widgets/qplaintextedit.h index 021308493a..432ec85a57 100644 --- a/src/widgets/widgets/qplaintextedit.h +++ b/src/widgets/widgets/qplaintextedit.h @@ -40,6 +40,7 @@ #ifndef QPLAINTEXTEDIT_H #define QPLAINTEXTEDIT_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qtextedit.h> #include <QtWidgets/qabstractscrollarea.h> diff --git a/src/widgets/widgets/qplaintextedit_p.h b/src/widgets/widgets/qplaintextedit_p.h index f5a027be42..f0dd1c0ed4 100644 --- a/src/widgets/widgets/qplaintextedit_p.h +++ b/src/widgets/widgets/qplaintextedit_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include "private/qabstractscrollarea_p.h" #include "QtGui/qtextdocumentfragment.h" #include "QtWidgets/qscrollbar.h" diff --git a/src/widgets/widgets/qprogressbar.h b/src/widgets/widgets/qprogressbar.h index 5ab702e9d0..2dbb7240c5 100644 --- a/src/widgets/widgets/qprogressbar.h +++ b/src/widgets/widgets/qprogressbar.h @@ -40,6 +40,7 @@ #ifndef QPROGRESSBAR_H #define QPROGRESSBAR_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qframe.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/widgets/qpushbutton.h b/src/widgets/widgets/qpushbutton.h index 0afd99bccc..56d4d1de20 100644 --- a/src/widgets/widgets/qpushbutton.h +++ b/src/widgets/widgets/qpushbutton.h @@ -40,6 +40,7 @@ #ifndef QPUSHBUTTON_H #define QPUSHBUTTON_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qabstractbutton.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/widgets/qpushbutton_p.h b/src/widgets/widgets/qpushbutton_p.h index 048f8aad2d..cd453a1339 100644 --- a/src/widgets/widgets/qpushbutton_p.h +++ b/src/widgets/widgets/qpushbutton_p.h @@ -40,6 +40,7 @@ #ifndef QPUSHBUTTON_P_H #define QPUSHBUTTON_P_H +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include "private/qabstractbutton_p.h" // diff --git a/src/widgets/widgets/qradiobutton.h b/src/widgets/widgets/qradiobutton.h index 76f5c1aae4..2dcb0d0fdf 100644 --- a/src/widgets/widgets/qradiobutton.h +++ b/src/widgets/widgets/qradiobutton.h @@ -40,6 +40,7 @@ #ifndef QRADIOBUTTON_H #define QRADIOBUTTON_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qabstractbutton.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/widgets/qrubberband.h b/src/widgets/widgets/qrubberband.h index 30ca96abef..217261bf75 100644 --- a/src/widgets/widgets/qrubberband.h +++ b/src/widgets/widgets/qrubberband.h @@ -40,6 +40,7 @@ #ifndef QRUBBERBAND_H #define QRUBBERBAND_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qwidget.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/widgets/qscrollarea.h b/src/widgets/widgets/qscrollarea.h index c530ed23ed..92ce287566 100644 --- a/src/widgets/widgets/qscrollarea.h +++ b/src/widgets/widgets/qscrollarea.h @@ -40,6 +40,7 @@ #ifndef QSCROLLAREA_H #define QSCROLLAREA_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qabstractscrollarea.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/widgets/qscrollarea_p.h b/src/widgets/widgets/qscrollarea_p.h index c628d1485e..f7c0725dbe 100644 --- a/src/widgets/widgets/qscrollarea_p.h +++ b/src/widgets/widgets/qscrollarea_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include <QtCore/qglobal.h> +#include <QtWidgets/private/qtwidgetsglobal_p.h> #ifndef QT_NO_SCROLLAREA diff --git a/src/widgets/widgets/qscrollbar.h b/src/widgets/widgets/qscrollbar.h index 4c4a374917..2b8a110c99 100644 --- a/src/widgets/widgets/qscrollbar.h +++ b/src/widgets/widgets/qscrollbar.h @@ -40,6 +40,7 @@ #ifndef QSCROLLBAR_H #define QSCROLLBAR_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qwidget.h> #include <QtWidgets/qabstractslider.h> diff --git a/src/widgets/widgets/qscrollbar_p.h b/src/widgets/widgets/qscrollbar_p.h index 97ea27afdb..e748edf6a9 100644 --- a/src/widgets/widgets/qscrollbar_p.h +++ b/src/widgets/widgets/qscrollbar_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include "private/qabstractslider_p.h" #include "qstyle.h" diff --git a/src/widgets/widgets/qsizegrip.h b/src/widgets/widgets/qsizegrip.h index a0e7de4fd8..831b146dd2 100644 --- a/src/widgets/widgets/qsizegrip.h +++ b/src/widgets/widgets/qsizegrip.h @@ -40,6 +40,7 @@ #ifndef QSIZEGRIP_H #define QSIZEGRIP_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qwidget.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/widgets/qslider.h b/src/widgets/widgets/qslider.h index 66b52c99bd..33b90ece06 100644 --- a/src/widgets/widgets/qslider.h +++ b/src/widgets/widgets/qslider.h @@ -40,6 +40,7 @@ #ifndef QSLIDER_H #define QSLIDER_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qabstractslider.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/widgets/qspinbox.h b/src/widgets/widgets/qspinbox.h index 3464aa86e6..2e77f0be7a 100644 --- a/src/widgets/widgets/qspinbox.h +++ b/src/widgets/widgets/qspinbox.h @@ -40,6 +40,7 @@ #ifndef QSPINBOX_H #define QSPINBOX_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qabstractspinbox.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/widgets/qsplashscreen.h b/src/widgets/widgets/qsplashscreen.h index 23588004a7..de58d86592 100644 --- a/src/widgets/widgets/qsplashscreen.h +++ b/src/widgets/widgets/qsplashscreen.h @@ -40,6 +40,7 @@ #ifndef QSPLASHSCREEN_H #define QSPLASHSCREEN_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtGui/qpixmap.h> #include <QtWidgets/qwidget.h> diff --git a/src/widgets/widgets/qsplitter.h b/src/widgets/widgets/qsplitter.h index a99bc1c78f..9cfde9fed3 100644 --- a/src/widgets/widgets/qsplitter.h +++ b/src/widgets/widgets/qsplitter.h @@ -40,6 +40,7 @@ #ifndef QSPLITTER_H #define QSPLITTER_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qframe.h> #include <QtWidgets/qsizepolicy.h> diff --git a/src/widgets/widgets/qsplitter_p.h b/src/widgets/widgets/qsplitter_p.h index 8bd44fab2b..4422d9a8a4 100644 --- a/src/widgets/widgets/qsplitter_p.h +++ b/src/widgets/widgets/qsplitter_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include "private/qframe_p.h" #include "qrubberband.h" diff --git a/src/widgets/widgets/qstackedwidget.h b/src/widgets/widgets/qstackedwidget.h index 266c59134b..36088ae033 100644 --- a/src/widgets/widgets/qstackedwidget.h +++ b/src/widgets/widgets/qstackedwidget.h @@ -40,6 +40,7 @@ #ifndef QSTACKEDWIDGET_H #define QSTACKEDWIDGET_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qframe.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/widgets/qstatusbar.h b/src/widgets/widgets/qstatusbar.h index 45416e46b3..aaabb99a27 100644 --- a/src/widgets/widgets/qstatusbar.h +++ b/src/widgets/widgets/qstatusbar.h @@ -40,6 +40,7 @@ #ifndef QSTATUSBAR_H #define QSTATUSBAR_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qwidget.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/widgets/qtabbar.h b/src/widgets/widgets/qtabbar.h index 84b2d40aea..71ca58c993 100644 --- a/src/widgets/widgets/qtabbar.h +++ b/src/widgets/widgets/qtabbar.h @@ -40,6 +40,7 @@ #ifndef QTABBAR_H #define QTABBAR_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qwidget.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/widgets/qtabbar_p.h b/src/widgets/widgets/qtabbar_p.h index 7c50ebd235..04adf96881 100644 --- a/src/widgets/widgets/qtabbar_p.h +++ b/src/widgets/widgets/qtabbar_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include "qtabbar.h" #include "private/qwidget_p.h" diff --git a/src/widgets/widgets/qtabwidget.h b/src/widgets/widgets/qtabwidget.h index c931fb9b83..59fcea223f 100644 --- a/src/widgets/widgets/qtabwidget.h +++ b/src/widgets/widgets/qtabwidget.h @@ -40,6 +40,7 @@ #ifndef QTABWIDGET_H #define QTABWIDGET_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qwidget.h> #include <QtGui/qicon.h> diff --git a/src/widgets/widgets/qtextbrowser.h b/src/widgets/widgets/qtextbrowser.h index 018c617f88..48b64d1216 100644 --- a/src/widgets/widgets/qtextbrowser.h +++ b/src/widgets/widgets/qtextbrowser.h @@ -40,6 +40,7 @@ #ifndef QTEXTBROWSER_H #define QTEXTBROWSER_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qtextedit.h> #include <QtCore/qurl.h> diff --git a/src/widgets/widgets/qtextedit.h b/src/widgets/widgets/qtextedit.h index 68ad54152b..3b523e3ed0 100644 --- a/src/widgets/widgets/qtextedit.h +++ b/src/widgets/widgets/qtextedit.h @@ -40,6 +40,7 @@ #ifndef QTEXTEDIT_H #define QTEXTEDIT_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qabstractscrollarea.h> #include <QtGui/qtextdocument.h> #include <QtGui/qtextoption.h> diff --git a/src/widgets/widgets/qtextedit_p.h b/src/widgets/widgets/qtextedit_p.h index c2f41aca66..cca315ce30 100644 --- a/src/widgets/widgets/qtextedit_p.h +++ b/src/widgets/widgets/qtextedit_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include "private/qabstractscrollarea_p.h" #include "QtGui/qtextdocumentfragment.h" #include "QtWidgets/qscrollbar.h" diff --git a/src/widgets/widgets/qtoolbar.h b/src/widgets/widgets/qtoolbar.h index c1d765598f..d361513bbf 100644 --- a/src/widgets/widgets/qtoolbar.h +++ b/src/widgets/widgets/qtoolbar.h @@ -40,6 +40,7 @@ #ifndef QDYNAMICTOOLBAR_H #define QDYNAMICTOOLBAR_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qaction.h> #include <QtWidgets/qwidget.h> diff --git a/src/widgets/widgets/qtoolbar_p.h b/src/widgets/widgets/qtoolbar_p.h index 7782b56962..616f53f717 100644 --- a/src/widgets/widgets/qtoolbar_p.h +++ b/src/widgets/widgets/qtoolbar_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include "qtoolbar.h" #include "QtWidgets/qaction.h" #include "private/qwidget_p.h" diff --git a/src/widgets/widgets/qtoolbararealayout_p.h b/src/widgets/widgets/qtoolbararealayout_p.h index a1ae68130c..901f04cf14 100644 --- a/src/widgets/widgets/qtoolbararealayout_p.h +++ b/src/widgets/widgets/qtoolbararealayout_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include <QList> #include <QSize> #include <QRect> diff --git a/src/widgets/widgets/qtoolbarextension_p.h b/src/widgets/widgets/qtoolbarextension_p.h index ea159ce986..c4d803165c 100644 --- a/src/widgets/widgets/qtoolbarextension_p.h +++ b/src/widgets/widgets/qtoolbarextension_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include "QtWidgets/qtoolbutton.h" QT_BEGIN_NAMESPACE diff --git a/src/widgets/widgets/qtoolbarlayout_p.h b/src/widgets/widgets/qtoolbarlayout_p.h index 1f93f04a53..9a81c4e50e 100644 --- a/src/widgets/widgets/qtoolbarlayout_p.h +++ b/src/widgets/widgets/qtoolbarlayout_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include <QtWidgets/qlayout.h> #include <private/qlayoutengine_p.h> #include <QVector> diff --git a/src/widgets/widgets/qtoolbarseparator_p.h b/src/widgets/widgets/qtoolbarseparator_p.h index 38e1f130f6..8c9cf9f46a 100644 --- a/src/widgets/widgets/qtoolbarseparator_p.h +++ b/src/widgets/widgets/qtoolbarseparator_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include "QtWidgets/qwidget.h" QT_BEGIN_NAMESPACE diff --git a/src/widgets/widgets/qtoolbox.h b/src/widgets/widgets/qtoolbox.h index 2e32668193..6556d8a202 100644 --- a/src/widgets/widgets/qtoolbox.h +++ b/src/widgets/widgets/qtoolbox.h @@ -40,6 +40,7 @@ #ifndef QTOOLBOX_H #define QTOOLBOX_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qframe.h> #include <QtGui/qicon.h> diff --git a/src/widgets/widgets/qtoolbutton.h b/src/widgets/widgets/qtoolbutton.h index 7b6114b5c1..95d159f12d 100644 --- a/src/widgets/widgets/qtoolbutton.h +++ b/src/widgets/widgets/qtoolbutton.h @@ -40,6 +40,7 @@ #ifndef QTOOLBUTTON_H #define QTOOLBUTTON_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qabstractbutton.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/widgets/qwidgetanimator_p.h b/src/widgets/widgets/qwidgetanimator_p.h index 4f16f7b3e5..6db8b67820 100644 --- a/src/widgets/widgets/qwidgetanimator_p.h +++ b/src/widgets/widgets/qwidgetanimator_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include <qobject.h> #include <qhash.h> #include <qpointer.h> diff --git a/src/widgets/widgets/qwidgetlinecontrol_p.h b/src/widgets/widgets/qwidgetlinecontrol_p.h index 5e52e29a51..db9039e302 100644 --- a/src/widgets/widgets/qwidgetlinecontrol_p.h +++ b/src/widgets/widgets/qwidgetlinecontrol_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include "QtCore/qglobal.h" +#include <QtWidgets/private/qtwidgetsglobal_p.h> #ifndef QT_NO_LINEEDIT #include "private/qwidget_p.h" diff --git a/src/widgets/widgets/qwidgetresizehandler_p.h b/src/widgets/widgets/qwidgetresizehandler_p.h index b955d8b7c3..7bb7d6cd94 100644 --- a/src/widgets/widgets/qwidgetresizehandler_p.h +++ b/src/widgets/widgets/qwidgetresizehandler_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include "QtCore/qobject.h" #include "QtCore/qpoint.h" diff --git a/src/widgets/widgets/qwidgettextcontrol_p.h b/src/widgets/widgets/qwidgettextcontrol_p.h index 89b96fa667..e1687f83a3 100644 --- a/src/widgets/widgets/qwidgettextcontrol_p.h +++ b/src/widgets/widgets/qwidgettextcontrol_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include <QtGui/qtextdocument.h> #include <QtGui/qtextoption.h> #include <QtGui/qtextcursor.h> diff --git a/src/widgets/widgets/qwidgettextcontrol_p_p.h b/src/widgets/widgets/qwidgettextcontrol_p_p.h index fea72d98ff..35027ff82a 100644 --- a/src/widgets/widgets/qwidgettextcontrol_p_p.h +++ b/src/widgets/widgets/qwidgettextcontrol_p_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include "QtGui/qtextdocumentfragment.h" #include "QtWidgets/qscrollbar.h" #include "QtGui/qtextcursor.h" |