Merge remote-tracking branch 'origin/5.15' into dev

 Conflicts:
	src/corelib/text/qstringliteral.h

Change-Id: I1665af3ce537471b249def5e080b39bd4105189e

3 files changed, 5 insertions, 6 deletions

diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp
index 189f12fd5c..5460104fd0 100644
--- a/src/gui/image/qimage.cpp
+++ b/src/gui/image/qimage.cpp
@@ -2122,12 +2122,7 @@ static QImage convertWithPalette(const QImage &src, QImage::Format format,
     QImage dest(src.size(), format);
     dest.setColorTable(clut);
 
-    QString textsKeys = src.text();
-    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());
-    }
+    QImageData::get(dest)->text = QImageData::get(src)->text;
 
     int h = src.height();
     int w = src.width();
diff --git a/src/gui/image/qimage.h b/src/gui/image/qimage.h
index df8d2729ef..138a52ab78 100644
--- a/src/gui/image/qimage.h
+++ b/src/gui/image/qimage.h
@@ -320,6 +320,7 @@ private:
     friend class QRasterPlatformPixmap;
     friend class QBlittablePlatformPixmap;
     friend class QPixmapCacheEntry;
+    friend struct QImageData;
 
 public:
     typedef QImageData * DataPtr;
diff --git a/src/gui/image/qimage_p.h b/src/gui/image/qimage_p.h
index 6f6f626858..e154ae8183 100644
--- a/src/gui/image/qimage_p.h
+++ b/src/gui/image/qimage_p.h
@@ -69,6 +69,9 @@ struct Q_GUI_EXPORT QImageData {        // internal image data
     static QImageData *create(const QSize &size, QImage::Format format);
     static QImageData *create(uchar *data, int w, int h,  qsizetype bpl, QImage::Format format, bool readOnly, QImageCleanupFunction cleanupFunction = nullptr, void *cleanupInfo = nullptr);
 
+    static QImageData *get(QImage &img) noexcept { return img.d; }
+    static const QImageData *get(const QImage &img) noexcept { return img.d; }
+
     QAtomicInt ref;
 
     int width;