Expose Qt.application.font

This is useful in order to specify font sizes that are some multiple of
the default size (which is almost always guaranteed to be a sensible,
legible size). For example:

Text {
    text: "Large text"
    font.pixelSize: Qt.application.font.pixelSize * 2
}

Other options are:

- "<h3>Large text</h3>" - adds extra space below the text since it's a
HTML element, so not really useful if you want a decent layout.

- Hard-coding a pixel size. Works OK when used in combination with
Qt::AA_EnableHighDpiScaling, and so long as you guess the correct size
that works for each device/display you're targeting. Doesn't work
without setting Qt::AA_EnableHighDpiScaling.

- Using FontMetrics/TextMetrics. Works fine, but is a bit verbose.

- Use an empty Text element. Creates an unnecessary item. Was
superseded by FontMetrics/TextMetrics.

- defaultPixelSize/implicitPixelSize and
defaultPointSize/implicitPointSize. There are already font-related
properties outside of the font grouped property, so this wouldn't be
out of place, but the API is already quite large.

[ChangeLog][QtQuick] Added Qt.application.font property.

Change-Id: I2d0899f2a6b717aab9afcea59f42fbf3715d8406
Task-number: QTBUG-50298
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>

4 files changed, 29 insertions, 0 deletions

diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp
index 0e99e4ca89..e989d37c6f 100644
--- a/src/qml/qml/qqmlengine.cpp
+++ b/src/qml/qml/qqmlengine.cpp
@@ -493,6 +493,10 @@ The following functions are also on the Qt object.
                         from right to left.
     \endlist
     \row
+    \li \c application.font
+    \li This read-only property holds the default application font as
+        returned by \l QGuiApplication::font().
+    \row
     \li \c application.arguments
     \li This is a string list of the arguments the executable was invoked with.
     \row
@@ -531,6 +535,7 @@ The following functions are also on the Qt object.
     \li application.active
     \li application.state
     \li application.layoutDirection
+    \li application.font
     \endlist
 */
 
diff --git a/src/quick/util/qquickapplication.cpp b/src/quick/util/qquickapplication.cpp
index a4e2f0eb0e..5c26b23ff7 100644
--- a/src/quick/util/qquickapplication.cpp
+++ b/src/quick/util/qquickapplication.cpp
@@ -90,4 +90,9 @@ Qt::ApplicationState QQuickApplication::state() const
     return QGuiApplication::applicationState();
 }
 
+QFont QQuickApplication::font() const
+{
+    return QGuiApplication::font();
+}
+
 QT_END_NAMESPACE
diff --git a/src/quick/util/qquickapplication_p.h b/src/quick/util/qquickapplication_p.h
index 971c9a203a..091cb094ed 100644
--- a/src/quick/util/qquickapplication_p.h
+++ b/src/quick/util/qquickapplication_p.h
@@ -52,6 +52,7 @@
 //
 
 #include <QtCore/QObject>
+#include <QtGui/QFont>
 #include <qqml.h>
 #include <QtQml/private/qqmlglobal_p.h>
 #include <private/qtquickglobal_p.h>
@@ -66,6 +67,7 @@ class Q_AUTOTEST_EXPORT QQuickApplication : public QQmlApplication
     Q_PROPERTY(Qt::LayoutDirection layoutDirection READ layoutDirection NOTIFY layoutDirectionChanged)
     Q_PROPERTY(bool supportsMultipleWindows READ supportsMultipleWindows CONSTANT)
     Q_PROPERTY(Qt::ApplicationState state READ state NOTIFY stateChanged)
+    Q_PROPERTY(QFont font READ font CONSTANT)
 
 public:
     explicit QQuickApplication(QObject *parent = 0);
@@ -74,6 +76,7 @@ public:
     Qt::LayoutDirection layoutDirection() const;
     bool supportsMultipleWindows() const;
     Qt::ApplicationState state() const;
+    QFont font() const;
 
 Q_SIGNALS:
     void activeChanged();
diff --git a/tests/auto/quick/qquickapplication/tst_qquickapplication.cpp b/tests/auto/quick/qquickapplication/tst_qquickapplication.cpp
index 1bd163fc4a..114f906736 100644
--- a/tests/auto/quick/qquickapplication/tst_qquickapplication.cpp
+++ b/tests/auto/quick/qquickapplication/tst_qquickapplication.cpp
@@ -47,6 +47,7 @@ private slots:
     void active();
     void state();
     void layoutDirection();
+    void font();
     void inputMethod();
     void styleHints();
     void cleanup();
@@ -196,6 +197,21 @@ void tst_qquickapplication::layoutDirection()
     QCOMPARE(Qt::LayoutDirection(item->property("layoutDirection").toInt()), Qt::LeftToRight);
 }
 
+void tst_qquickapplication::font()
+{
+    QQmlComponent component(&engine);
+    component.setData("import QtQuick 2.0; Item { property font defaultFont: Qt.application.font }", QUrl::fromLocalFile(""));
+    QQuickItem *item = qobject_cast<QQuickItem *>(component.create());
+    QVERIFY(item);
+    QQuickView view;
+    item->setParentItem(view.rootObject());
+
+    QVariant defaultFontProperty = item->property("defaultFont");
+    QVERIFY(defaultFontProperty.isValid());
+    QCOMPARE(defaultFontProperty.type(), QVariant::Font);
+    QCOMPARE(defaultFontProperty.value<QFont>(), qApp->font());
+}
+
 void tst_qquickapplication::inputMethod()
 {
     // technically not in QQuickApplication, but testing anyway here