diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-14 01:00:34 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-14 01:00:34 +0200 |
| commit | e164d61ca8263fc4b46fdd916e1ea77c7dd2b735 (patch) | |
| tree | 06c50077b8baf41b756dc1aa8021c4a9ca34a9d4 /src/gui/image/qmovie.cpp | |
| parent | 721a0e807881e4d00e752e3c3cf62427eb681dd2 (diff) | |
| parent | 8d8140dffa9aa680a519b501fc5bdf08c91dd735 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I129dd579f92cb2592a38ca043472b45cb926ae12
Diffstat (limited to 'src/gui/image/qmovie.cpp')
| -rw-r--r-- | src/gui/image/qmovie.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/image/qmovie.cpp b/src/gui/image/qmovie.cpp index 3e975115ab..25fce050a1 100644 --- a/src/gui/image/qmovie.cpp +++ b/src/gui/image/qmovie.cpp @@ -414,7 +414,7 @@ QFrameInfo QMoviePrivate::infoForFrame(int frameNumber) } else { // We've read all frames now. Return an end marker haveReadAll = true; - return QFrameInfo::endMarker(); + return frameNumber == greatestFrameNumber + 1 ? QFrameInfo::endMarker() : QFrameInfo(); } } } |