Merge remote-tracking branch 'origin/5.9' into 5.11

 Conflicts:
	.qmake.conf
	src/corelib/animation/qvariantanimation.cpp
	src/corelib/global/qglobal.cpp
	src/corelib/global/qlogging.cpp
	src/corelib/io/qprocess_win.cpp
	src/corelib/json/qjsonarray.cpp
	src/corelib/tools/qsimd_p.h
	src/corelib/tools/qtimezoneprivate_p.h
	src/corelib/xml/qxmlstream_p.h
	src/gui/kernel/qsimpledrag.cpp
	src/gui/kernel/qsimpledrag_p.h
	src/plugins/generic/generic.pro
	src/plugins/platforms/cocoa/qcocoamenu.mm
	src/widgets/styles/qmacstyle_mac.mm
	tests/auto/concurrent/qtconcurrentmap/BLACKLIST
	tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp
	tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
	tests/auto/gui/kernel/qwindow/BLACKLIST
	tests/auto/widgets/dialogs/qmessagebox/BLACKLIST

Change-Id: I508d686cf20f7f8cc6a7119b9bc7c3bbb505c58e

1 files changed, 39 insertions, 0 deletions

diff --git a/tests/auto/gui/text/qrawfont/tst_qrawfont.cpp b/tests/auto/gui/text/qrawfont/tst_qrawfont.cpp
index 37f94d0278..373ad7fef9 100644
--- a/tests/auto/gui/text/qrawfont/tst_qrawfont.cpp
+++ b/tests/auto/gui/text/qrawfont/tst_qrawfont.cpp
@@ -93,6 +93,9 @@ private slots:
 
     void fallbackFontsOrder();
 
+    void qtbug65923_partal_clone_data();
+    void qtbug65923_partal_clone();
+
 private:
     QString testFont;
     QString testFontBoldItalic;
@@ -1044,6 +1047,42 @@ void tst_QRawFont::fallbackFontsOrder()
     fontDatabase.removeApplicationFont(id);
 }
 
+void tst_QRawFont::qtbug65923_partal_clone_data()
+{
+    QTest::addColumn<bool>("shouldClone");
+
+    QTest::newRow("Without cloning font engine") << false;
+    QTest::newRow("Cloning font engine") << true;
+}
+
+void tst_QRawFont::qtbug65923_partal_clone()
+{
+    QFile file(testFont);
+    file.open(QIODevice::ReadOnly);
+    QByteArray fontData = file.readAll();
+
+    QRawFont outerFont;
+
+    {
+        QRawFont innerFont(fontData, 16, QFont::PreferDefaultHinting);
+
+        QFETCH(bool, shouldClone);
+        if (shouldClone) {
+            // This will trigger QFontEngine::cloneWithSize
+            innerFont.setPixelSize(innerFont.pixelSize() + 1);
+        }
+
+        outerFont = innerFont;
+    }
+
+    // This will detach if data is shared with the raw font. If the raw font has
+    // a naked reference to the data, without informing Qt of it via the ref count
+    // of the byte array, this will result in clearing 'live' data.
+    fontData.fill('\0');
+
+    QVERIFY(!outerFont.boundingRect(42).isEmpty());
+}
+
 #endif // QT_NO_RAWFONT
 
 QTEST_MAIN(tst_QRawFont)