Merge remote-tracking branch 'origin/5.6' into 5.7

Conflicts:
	configure
	src/plugins/platforms/eglfs/qeglfsintegration.cpp
	src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp

Change-Id: Id2da7c775439adb62646d5b741ee7c638042b34b

1 files changed, 21 insertions, 1 deletions

diff --git a/src/widgets/styles/qstylehelper.cpp b/src/widgets/styles/qstylehelper.cpp
index f073f1cccb..754062ac26 100644
--- a/src/widgets/styles/qstylehelper.cpp
+++ b/src/widgets/styles/qstylehelper.cpp
@@ -49,6 +49,8 @@
 
 #include "qstylehelper_p.h"
 #include <qstringbuilder.h>
+#include <qdatastream.h>
+#include <qcryptographichash.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -62,7 +64,6 @@ QString uniqueName(const QString &key, const QStyleOption *option, const QSize &
     QString tmp = key % HexString<uint>(option->state)
                       % HexString<uint>(option->direction)
                       % HexString<uint>(complexOption ? uint(complexOption->activeSubControls) : 0u)
-                      % HexString<quint64>(option->palette.cacheKey())
                       % HexString<uint>(size.width())
                       % HexString<uint>(size.height());
 
@@ -73,6 +74,25 @@ QString uniqueName(const QString &key, const QStyleOption *option, const QSize &
                   % QLatin1Char(spinBox->frame ? '1' : '0'); ;
     }
 #endif // QT_NO_SPINBOX
+
+    // QTBUG-56743, try to create a palette cache key reflecting the value,
+    // as leaks may occur in conjunction with QStyleSheetStyle/QRenderRule modifying
+    // palettes when using QPalette::cacheKey()
+    if (option->palette != QGuiApplication::palette()) {
+        tmp.append(QLatin1Char('P'));
+#ifndef QT_NO_DATASTREAM
+        QByteArray key;
+        key.reserve(5120); // Observed 5040B for a serialized palette on 64bit
+        {
+            QDataStream str(&key, QIODevice::WriteOnly);
+            str << option->palette;
+        }
+        const QByteArray sha1 = QCryptographicHash::hash(key, QCryptographicHash::Sha1).toHex();
+        tmp.append(QString::fromLatin1(sha1));
+#else // QT_NO_DATASTREAM
+        tmp.append(QString::number(option->palette.cacheKey(), 16));
+#endif // !QT_NO_DATASTREAM
+    }
     return tmp;
 }