diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-06-07 12:05:33 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-06-07 14:02:43 +0200 |
| commit | 7cbee5629604aa49c618829c8e3e55fc64e94df7 (patch) | |
| tree | d12041105160c1cb21226b365edb9653d87b5853 /src/gui/image/qmovie.cpp | |
| parent | e400b7e326c554ccd819448866265953d2a0f24d (diff) | |
| parent | 5f0ce2333f7e11a3ffb5d16a27cd9303efa712d5 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/widgets/widgets/qmenu.cpp
Change-Id: I6d3baf56eb24501cddb129a3cb6b958ccc25a308
Diffstat (limited to 'src/gui/image/qmovie.cpp')
| -rw-r--r-- | src/gui/image/qmovie.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/gui/image/qmovie.cpp b/src/gui/image/qmovie.cpp index 3889b747db..2ff9fb4e36 100644 --- a/src/gui/image/qmovie.cpp +++ b/src/gui/image/qmovie.cpp @@ -174,8 +174,6 @@ #include "qmovie.h" -#ifndef QT_NO_MOVIE - #include "qglobal.h" #include "qimage.h" #include "qimagereader.h" @@ -1062,5 +1060,3 @@ void QMovie::setCacheMode(CacheMode cacheMode) QT_END_NAMESPACE #include "moc_qmovie.cpp" - -#endif // QT_NO_MOVIE |