diff options
Diffstat (limited to 'src/gui/image')
29 files changed, 31 insertions, 7 deletions
diff --git a/src/gui/image/qbitmap.h b/src/gui/image/qbitmap.h index 68727e74b5..def59b3f89 100644 --- a/src/gui/image/qbitmap.h +++ b/src/gui/image/qbitmap.h @@ -40,6 +40,7 @@ #ifndef QBITMAP_H #define QBITMAP_H +#include <QtGui/qtguiglobal.h> #include <QtGui/qpixmap.h> QT_BEGIN_NAMESPACE diff --git a/src/gui/image/qbmphandler_p.h b/src/gui/image/qbmphandler_p.h index c4800e3f97..258ce0fce6 100644 --- a/src/gui/image/qbmphandler_p.h +++ b/src/gui/image/qbmphandler_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtGui/private/qtguiglobal_p.h> #include "QtGui/qimageiohandler.h" #ifndef QT_NO_IMAGEFORMAT_BMP diff --git a/src/gui/image/qicon.h b/src/gui/image/qicon.h index 1b0e73c21b..40d3e92af9 100644 --- a/src/gui/image/qicon.h +++ b/src/gui/image/qicon.h @@ -40,7 +40,7 @@ #ifndef QICON_H #define QICON_H -#include <QtCore/qglobal.h> +#include <QtGui/qtguiglobal.h> #include <QtCore/qsize.h> #include <QtCore/qlist.h> #include <QtGui/qpixmap.h> diff --git a/src/gui/image/qicon_p.h b/src/gui/image/qicon_p.h index cfae9b3e52..a978a72192 100644 --- a/src/gui/image/qicon_p.h +++ b/src/gui/image/qicon_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include <QtCore/qglobal.h> +#include <QtGui/private/qtguiglobal_p.h> #include <QtCore/qsize.h> #include <QtCore/qlist.h> #include <QtGui/qpixmap.h> diff --git a/src/gui/image/qiconengine.h b/src/gui/image/qiconengine.h index c702a1e8bb..b0c92ced73 100644 --- a/src/gui/image/qiconengine.h +++ b/src/gui/image/qiconengine.h @@ -40,7 +40,7 @@ #ifndef QICONENGINE_H #define QICONENGINE_H -#include <QtCore/qglobal.h> +#include <QtGui/qtguiglobal.h> #include <QtCore/qlist.h> #include <QtGui/qicon.h> diff --git a/src/gui/image/qiconengineplugin.h b/src/gui/image/qiconengineplugin.h index aacb3a9ebb..7a01d3731c 100644 --- a/src/gui/image/qiconengineplugin.h +++ b/src/gui/image/qiconengineplugin.h @@ -40,6 +40,7 @@ #ifndef QICONENGINEPLUGIN_H #define QICONENGINEPLUGIN_H +#include <QtGui/qtguiglobal.h> #include <QtCore/qplugin.h> #include <QtCore/qfactoryinterface.h> diff --git a/src/gui/image/qiconloader_p.h b/src/gui/image/qiconloader_p.h index 0945add2fb..583499be76 100644 --- a/src/gui/image/qiconloader_p.h +++ b/src/gui/image/qiconloader_p.h @@ -40,7 +40,7 @@ #ifndef QICONLOADER_P_H #define QICONLOADER_P_H -#include <QtCore/qglobal.h> +#include <QtGui/private/qtguiglobal_p.h> #ifndef QT_NO_ICON // diff --git a/src/gui/image/qimage.h b/src/gui/image/qimage.h index 6f8e214b11..a99134d3bb 100644 --- a/src/gui/image/qimage.h +++ b/src/gui/image/qimage.h @@ -40,6 +40,7 @@ #ifndef QIMAGE_H #define QIMAGE_H +#include <QtGui/qtguiglobal.h> #include <QtGui/qcolor.h> #include <QtGui/qrgb.h> #include <QtGui/qpaintdevice.h> diff --git a/src/gui/image/qimage_p.h b/src/gui/image/qimage_p.h index 3e76f39b94..b6eacc6af8 100644 --- a/src/gui/image/qimage_p.h +++ b/src/gui/image/qimage_p.h @@ -51,7 +51,7 @@ // We mean it. // -#include <QtCore/qglobal.h> +#include <QtGui/private/qtguiglobal_p.h> #include <QMap> #include <QVector> diff --git a/src/gui/image/qimageiohandler.h b/src/gui/image/qimageiohandler.h index 8f196ee9e0..baf9853259 100644 --- a/src/gui/image/qimageiohandler.h +++ b/src/gui/image/qimageiohandler.h @@ -40,6 +40,7 @@ #ifndef QIMAGEIOHANDLER_H #define QIMAGEIOHANDLER_H +#include <QtGui/qtguiglobal.h> #include <QtCore/qiodevice.h> #include <QtCore/qplugin.h> #include <QtCore/qfactoryinterface.h> diff --git a/src/gui/image/qimagepixmapcleanuphooks_p.h b/src/gui/image/qimagepixmapcleanuphooks_p.h index f0ac17b0a9..29144c6656 100644 --- a/src/gui/image/qimagepixmapcleanuphooks_p.h +++ b/src/gui/image/qimagepixmapcleanuphooks_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtGui/private/qtguiglobal_p.h> #include <QtGui/qpixmap.h> QT_BEGIN_NAMESPACE diff --git a/src/gui/image/qimagereader.h b/src/gui/image/qimagereader.h index ad4f56c001..9d6c1e0b1e 100644 --- a/src/gui/image/qimagereader.h +++ b/src/gui/image/qimagereader.h @@ -40,6 +40,7 @@ #ifndef QIMAGEREADER_H #define QIMAGEREADER_H +#include <QtGui/qtguiglobal.h> #include <QtCore/qbytearray.h> #include <QtCore/qcoreapplication.h> #include <QtGui/qimage.h> diff --git a/src/gui/image/qimagewriter.h b/src/gui/image/qimagewriter.h index a6208ae5dc..58f8c51472 100644 --- a/src/gui/image/qimagewriter.h +++ b/src/gui/image/qimagewriter.h @@ -40,6 +40,7 @@ #ifndef QIMAGEWRITER_H #define QIMAGEWRITER_H +#include <QtGui/qtguiglobal.h> #include <QtCore/qbytearray.h> #include <QtCore/qcoreapplication.h> #include <QtCore/qlist.h> diff --git a/src/gui/image/qmovie.h b/src/gui/image/qmovie.h index cf644d3347..2b41e07dba 100644 --- a/src/gui/image/qmovie.h +++ b/src/gui/image/qmovie.h @@ -40,10 +40,11 @@ #ifndef QMOVIE_H #define QMOVIE_H -#include <QtCore/qobject.h> +#include <QtGui/qtguiglobal.h> #ifndef QT_NO_MOVIE +#include <QtCore/qobject.h> #include <QtCore/qbytearray.h> #include <QtCore/qlist.h> #include <QtGui/qimagereader.h> diff --git a/src/gui/image/qnativeimage_p.h b/src/gui/image/qnativeimage_p.h index 2398a6e2ce..3824fa6465 100644 --- a/src/gui/image/qnativeimage_p.h +++ b/src/gui/image/qnativeimage_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtGui/private/qtguiglobal_p.h> #include "qimage.h" diff --git a/src/gui/image/qpaintengine_pic_p.h b/src/gui/image/qpaintengine_pic_p.h index 6894593092..277004d055 100644 --- a/src/gui/image/qpaintengine_pic_p.h +++ b/src/gui/image/qpaintengine_pic_p.h @@ -52,7 +52,8 @@ // // -#include "QtGui/qpaintengine.h" +#include <QtGui/private/qtguiglobal_p.h> +#include <QtGui/qpaintengine.h> #ifndef QT_NO_PICTURE diff --git a/src/gui/image/qpicture.h b/src/gui/image/qpicture.h index f375157317..8da11caee4 100644 --- a/src/gui/image/qpicture.h +++ b/src/gui/image/qpicture.h @@ -40,6 +40,7 @@ #ifndef QPICTURE_H #define QPICTURE_H +#include <QtGui/qtguiglobal.h> #include <QtCore/qiodevice.h> #include <QtCore/qstringlist.h> #include <QtCore/qsharedpointer.h> diff --git a/src/gui/image/qpicture_p.h b/src/gui/image/qpicture_p.h index df1235469c..67db9aa354 100644 --- a/src/gui/image/qpicture_p.h +++ b/src/gui/image/qpicture_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtGui/private/qtguiglobal_p.h> #include "QtCore/qatomic.h" #include "QtCore/qbuffer.h" #include "QtCore/qobjectdefs.h" diff --git a/src/gui/image/qpictureformatplugin.h b/src/gui/image/qpictureformatplugin.h index 003ccac116..32195687c7 100644 --- a/src/gui/image/qpictureformatplugin.h +++ b/src/gui/image/qpictureformatplugin.h @@ -40,6 +40,7 @@ #ifndef QPICTUREFORMATPLUGIN_H #define QPICTUREFORMATPLUGIN_H +#include <QtGui/qtguiglobal.h> #include <QtCore/qplugin.h> #include <QtCore/qfactoryinterface.h> diff --git a/src/gui/image/qpixmap.h b/src/gui/image/qpixmap.h index 165ec4a6b8..d651b57fd5 100644 --- a/src/gui/image/qpixmap.h +++ b/src/gui/image/qpixmap.h @@ -40,6 +40,7 @@ #ifndef QPIXMAP_H #define QPIXMAP_H +#include <QtGui/qtguiglobal.h> #include <QtGui/qpaintdevice.h> #include <QtGui/qcolor.h> #include <QtCore/qnamespace.h> diff --git a/src/gui/image/qpixmap_blitter_p.h b/src/gui/image/qpixmap_blitter_p.h index be8b9093c7..546e2fef79 100644 --- a/src/gui/image/qpixmap_blitter_p.h +++ b/src/gui/image/qpixmap_blitter_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtGui/private/qtguiglobal_p.h> #include <qpa/qplatformpixmap.h> #include <private/qpaintengine_blitter_p.h> diff --git a/src/gui/image/qpixmap_raster_p.h b/src/gui/image/qpixmap_raster_p.h index 1a42757669..fde82bcbe9 100644 --- a/src/gui/image/qpixmap_raster_p.h +++ b/src/gui/image/qpixmap_raster_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtGui/private/qtguiglobal_p.h> #include <qpa/qplatformpixmap.h> diff --git a/src/gui/image/qpixmapcache.h b/src/gui/image/qpixmapcache.h index cc35fd0fd2..856b82f559 100644 --- a/src/gui/image/qpixmapcache.h +++ b/src/gui/image/qpixmapcache.h @@ -40,6 +40,7 @@ #ifndef QPIXMAPCACHE_H #define QPIXMAPCACHE_H +#include <QtGui/qtguiglobal.h> #include <QtGui/qpixmap.h> QT_BEGIN_NAMESPACE diff --git a/src/gui/image/qpixmapcache_p.h b/src/gui/image/qpixmapcache_p.h index 951c4ea9b1..3c57367514 100644 --- a/src/gui/image/qpixmapcache_p.h +++ b/src/gui/image/qpixmapcache_p.h @@ -50,6 +50,7 @@ // We mean it. // +#include <QtGui/private/qtguiglobal_p.h> #include "qpixmapcache.h" #include "qpaintengine.h" #include <private/qimage_p.h> diff --git a/src/gui/image/qplatformpixmap.h b/src/gui/image/qplatformpixmap.h index c83278a4c3..8513755cca 100644 --- a/src/gui/image/qplatformpixmap.h +++ b/src/gui/image/qplatformpixmap.h @@ -49,6 +49,7 @@ // source and binary incompatible with future versions of Qt. // +#include <QtGui/qtguiglobal.h> #include <QtGui/qpixmap.h> #include <QtCore/qatomic.h> diff --git a/src/gui/image/qpnghandler_p.h b/src/gui/image/qpnghandler_p.h index fb5a830baa..0232df7c3f 100644 --- a/src/gui/image/qpnghandler_p.h +++ b/src/gui/image/qpnghandler_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtGui/private/qtguiglobal_p.h> #include "QtGui/qimageiohandler.h" #ifndef QT_NO_IMAGEFORMAT_PNG diff --git a/src/gui/image/qppmhandler_p.h b/src/gui/image/qppmhandler_p.h index 1e8ca2b81e..3106d74651 100644 --- a/src/gui/image/qppmhandler_p.h +++ b/src/gui/image/qppmhandler_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtGui/private/qtguiglobal_p.h> #include "QtGui/qimageiohandler.h" #ifndef QT_NO_IMAGEFORMAT_PPM diff --git a/src/gui/image/qxbmhandler_p.h b/src/gui/image/qxbmhandler_p.h index 5094a43ef6..c59872f4be 100644 --- a/src/gui/image/qxbmhandler_p.h +++ b/src/gui/image/qxbmhandler_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtGui/private/qtguiglobal_p.h> #include "QtGui/qimageiohandler.h" #ifndef QT_NO_IMAGEFORMAT_XBM diff --git a/src/gui/image/qxpmhandler_p.h b/src/gui/image/qxpmhandler_p.h index 9a2041be94..51e5d6dc6c 100644 --- a/src/gui/image/qxpmhandler_p.h +++ b/src/gui/image/qxpmhandler_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtGui/private/qtguiglobal_p.h> #include "QtGui/qimageiohandler.h" #ifndef QT_NO_IMAGEFORMAT_XPM |