diff options
Diffstat (limited to 'src/gui/text/qtextdocumentlayout.cpp')
-rw-r--r-- | src/gui/text/qtextdocumentlayout.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/gui/text/qtextdocumentlayout.cpp b/src/gui/text/qtextdocumentlayout.cpp index 3138168e906..81fe6eb6407 100644 --- a/src/gui/text/qtextdocumentlayout.cpp +++ b/src/gui/text/qtextdocumentlayout.cpp @@ -3756,11 +3756,7 @@ static void markFrames(QTextFrame *current, int from, int oldLength, int length) QTextFrameData *fd = data(current); // float got removed in editing operation - QTextFrame *null = nullptr; // work-around for (at least) MSVC 2012 emitting - // warning C4100 for its own header <algorithm> - // when passing nullptr directly to std::remove - fd->floats.erase(std::remove(fd->floats.begin(), fd->floats.end(), null), - fd->floats.end()); + fd->floats.removeAll(nullptr); fd->layoutDirty = true; fd->sizeDirty = true; |