diff options
| author | Stephan Binner <stephan.binner@basyskom.com> | 2017-05-20 20:07:58 +0200 |
|---|---|---|
| committer | Stephan Binner <stephan.binner@basyskom.com> | 2017-05-29 10:46:50 +0000 |
| commit | 3945cf1f9aa3c4f43b995cc695cc3cfb5ec75c8c (patch) | |
| tree | 95bc8edabe371f343bcebd921ac19b024337165c /src/gui/image | |
| parent | 9ec028071409410dba192ec1c1e228cf3aea224b (diff) | |
Convert features.movie to QT_[REQUIRE_]CONFIG
Change-Id: I838c7305d4649f953c5bb972f1aa51dbb078afe2
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'src/gui/image')
| -rw-r--r-- | src/gui/image/image.pri | 6 | ||||
| -rw-r--r-- | src/gui/image/qmovie.cpp | 4 | ||||
| -rw-r--r-- | src/gui/image/qmovie.h | 7 |
3 files changed, 6 insertions, 11 deletions
diff --git a/src/gui/image/image.pri b/src/gui/image/image.pri index bac00f7e95..76aba944b2 100644 --- a/src/gui/image/image.pri +++ b/src/gui/image/image.pri @@ -10,7 +10,6 @@ HEADERS += \ image/qimageiohandler.h \ image/qimagereader.h \ image/qimagewriter.h \ - image/qmovie.h \ image/qpaintengine_pic_p.h \ image/qpicture.h \ image/qpicture_p.h \ @@ -41,7 +40,6 @@ SOURCES += \ image/qpixmap.cpp \ image/qpixmapcache.cpp \ image/qplatformpixmap.cpp \ - image/qmovie.cpp \ image/qpixmap_raster.cpp \ image/qpixmap_blitter.cpp \ image/qimagepixmapcleanuphooks.cpp \ @@ -50,6 +48,10 @@ SOURCES += \ image/qiconengine.cpp \ image/qiconengineplugin.cpp \ +qtConfig(movie) { + HEADERS += image/qmovie.h + SOURCES += image/qmovie.cpp +} win32:!winrt: SOURCES += image/qpixmap_win.cpp diff --git a/src/gui/image/qmovie.cpp b/src/gui/image/qmovie.cpp index 55ddd839b7..a1ca857daa 100644 --- a/src/gui/image/qmovie.cpp +++ b/src/gui/image/qmovie.cpp @@ -172,8 +172,6 @@ #include "qmovie.h" -#ifndef QT_NO_MOVIE - #include "qglobal.h" #include "qimage.h" #include "qimagereader.h" @@ -1020,5 +1018,3 @@ void QMovie::setCacheMode(CacheMode cacheMode) QT_END_NAMESPACE #include "moc_qmovie.cpp" - -#endif // QT_NO_MOVIE diff --git a/src/gui/image/qmovie.h b/src/gui/image/qmovie.h index 2b41e07dba..930d502892 100644 --- a/src/gui/image/qmovie.h +++ b/src/gui/image/qmovie.h @@ -42,15 +42,14 @@ #include <QtGui/qtguiglobal.h> -#ifndef QT_NO_MOVIE - #include <QtCore/qobject.h> #include <QtCore/qbytearray.h> #include <QtCore/qlist.h> #include <QtGui/qimagereader.h> -QT_BEGIN_NAMESPACE +QT_REQUIRE_CONFIG(movie); +QT_BEGIN_NAMESPACE class QByteArray; class QColor; @@ -144,6 +143,4 @@ private: QT_END_NAMESPACE -#endif // QT_NO_MOVIE - #endif // QMOVIE_H |