diff options
author | Liang Qi <liang.qi@qt.io> | 2019-10-10 09:13:49 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-10-10 09:13:49 +0200 |
commit | 9c84b7786cac7ea1cf1a8a61b503fca4b5553a49 (patch) | |
tree | af018122dac633ad74f8e62bf260d1fb8339982a /src/gui | |
parent | 18aa8390ce83b4aa9cabe5609b8f830f86e475e5 (diff) | |
parent | 63a3b26b6b2dae88a44ad6a4917563b5331823d6 (diff) |
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
src/plugins/platforms/xcb/qxcbscreen.h
src/src.pro
Change-Id: I4e1981e69a1ddcbe4078ec6ab2a64b0da6a445de
Diffstat (limited to 'src/gui')
-rw-r--r-- | src/gui/image/qmovie.cpp | 2 | ||||
-rw-r--r-- | src/gui/text/qtextodfwriter.cpp | 2 |
2 files changed, 2 insertions, 2 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(); } } } diff --git a/src/gui/text/qtextodfwriter.cpp b/src/gui/text/qtextodfwriter.cpp index 3561c185a6..0e8666565f 100644 --- a/src/gui/text/qtextodfwriter.cpp +++ b/src/gui/text/qtextodfwriter.cpp @@ -358,7 +358,7 @@ void QTextOdfWriter::writeBlock(QXmlStreamWriter &writer, const QTextBlock &bloc int precedingSpaces = 0; int exportedIndex = 0; for (int i=0; i <= fragmentText.count(); ++i) { - QChar character = fragmentText[i]; + QChar character = (i == fragmentText.count() ? QChar() : fragmentText.at(i)); bool isSpace = character.unicode() == ' '; // find more than one space. -> <text:s text:c="2" /> |