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

Conflicts:
	src/quickcontrols2/qquicktheme.cpp

Change-Id: I874011d32a379bf982f760c39c46d3a25e2452d6

1 files changed, 37 insertions, 0 deletions

diff --git a/tests/auto/font/tst_font.cpp b/tests/auto/font/tst_font.cpp
index f3f9dbf5..65dd4971 100644
--- a/tests/auto/font/tst_font.cpp
+++ b/tests/auto/font/tst_font.cpp
@@ -38,6 +38,7 @@
 #include "../shared/visualtestutil.h"
 
 #include <QtGui/qfont.h>
+#include <QtGui/qpa/qplatformtheme.h>
 #include <QtGui/private/qguiapplication_p.h>
 #include <QtQml/qqmlengine.h>
 #include <QtQml/qqmlcomponent.h>
@@ -53,6 +54,8 @@ class tst_font : public QQmlDataTest
     Q_OBJECT
 
 private slots:
+    void systemFont();
+
     void font_data();
     void font();
 
@@ -66,6 +69,40 @@ private slots:
     void listView();
 };
 
+static QFont testFont()
+{
+    QQmlEngine engine;
+    QQmlComponent component(&engine);
+    component.setData("import QtQuick 2.0; import QtQuick.Controls 2.0; Text { }", QUrl());
+
+    QScopedPointer<QObject> object(component.create());
+    Q_ASSERT_X(!object.isNull(), "testFont", qPrintable(component.errorString()));
+
+    QVariant var = object->property("font");
+    Q_ASSERT_X(var.isValid(), "testFont", var.typeName());
+    return var.value<QFont>();
+}
+
+void tst_font::systemFont()
+{
+    const QFont *originalSystemFont = QGuiApplicationPrivate::platformTheme()->font(QPlatformTheme::SystemFont);
+    if (!originalSystemFont)
+        QSKIP("Cannot test the system font on a minimal platform");
+
+    const QFont fontBefore = testFont();
+    QCOMPARE(fontBefore, *originalSystemFont);
+
+    qmlClearTypeRegistrations();
+    delete QGuiApplicationPrivate::app_font;
+    QGuiApplicationPrivate::app_font = nullptr;
+
+    const QFont appFont = QGuiApplication::font();
+    QCOMPARE(appFont, *originalSystemFont);
+
+    const QFont fontAfter = testFont();
+    QCOMPARE(fontAfter, *originalSystemFont);
+}
+
 void tst_font::font_data()
 {
     QTest::addColumn<QString>("testFile");