diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-01 01:00:23 +0100 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@qt.io> | 2020-03-03 14:13:02 +0100 |
commit | 63312fe2ec1c1d8c0efabc02e3af8e5b47ca320e (patch) | |
tree | fc850de8f31581cc6a64db7a78d1cca479e20ce9 /src/gui/image/qimage.cpp | |
parent | 5ebb03c47604e0597502fbe1069de636987f33fc (diff) | |
parent | fbebc93617d99d2bf8fed559f17dba8bed15a063 (diff) |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: If36d96c0fef3de5ab6503977501c55c62a2ecc97
Diffstat (limited to 'src/gui/image/qimage.cpp')
-rw-r--r-- | src/gui/image/qimage.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp index 1406683b97..ce0c6170c1 100644 --- a/src/gui/image/qimage.cpp +++ b/src/gui/image/qimage.cpp @@ -2118,7 +2118,7 @@ static QImage convertWithPalette(const QImage &src, QImage::Format format, dest.setColorTable(clut); QString textsKeys = src.text(); - const auto textKeyList = textsKeys.splitRef(QLatin1Char('\n'), QString::SkipEmptyParts); + const auto textKeyList = textsKeys.splitRef(QLatin1Char('\n'), Qt::SkipEmptyParts); for (const auto &textKey : textKeyList) { const auto textKeySplitted = textKey.split(QLatin1String(": ")); dest.setText(textKeySplitted[0].toString(), textKeySplitted[1].toString()); |