diff options
Diffstat (limited to 'src/widgets/styles')
27 files changed, 27 insertions, 2 deletions
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> |