Add QQuickApplication::displayName property

[ChangeLog][QtQuick] Add Qt.application.displayName property.

Task-number: QTBUG-53091
Change-Id: I810eb381ac8e6151cbc07f3f66f2e661ff3e09f4
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

3 files changed, 20 insertions, 0 deletions

diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp
index c273330a0a..d0c899af12 100644
--- a/src/qml/qml/qqmlengine.cpp
+++ b/src/qml/qml/qqmlengine.cpp
@@ -537,6 +537,10 @@ The following functions are also on the Qt object.
     \li This is the application name set on the QCoreApplication instance. This property can be written
     to in order to set the application name.
     \row
+    \li \c application.displayName (since Qt 5.9)
+    \li This is the application display name set on the QGuiApplication instance. This property can be written
+    to in order to set the application display name.
+    \row
     \li \c application.version
     \li This is the application version set on the QCoreApplication instance. This property can be written
     to in order to set the application version.
diff --git a/src/quick/util/qquickapplication.cpp b/src/quick/util/qquickapplication.cpp
index ca4a5bfb56..5c89275c5a 100644
--- a/src/quick/util/qquickapplication.cpp
+++ b/src/quick/util/qquickapplication.cpp
@@ -63,6 +63,8 @@ QQuickApplication::QQuickApplication(QObject *parent)
                 this, SIGNAL(stateChanged(Qt::ApplicationState)));
         connect(qApp, SIGNAL(applicationStateChanged(Qt::ApplicationState)),
                 this, SIGNAL(activeChanged()));
+        connect(qApp, SIGNAL(applicationDisplayNameChanged()),
+                this, SIGNAL(displayNameChanged()));
 
         connect(qApp, &QGuiApplication::screenAdded, this, &QQuickApplication::updateScreens);
         connect(qApp, &QGuiApplication::screenRemoved, this, &QQuickApplication::updateScreens);
@@ -99,6 +101,16 @@ QFont QQuickApplication::font() const
     return QGuiApplication::font();
 }
 
+QString QQuickApplication::displayName() const
+{
+    return QGuiApplication::applicationDisplayName();
+}
+
+void QQuickApplication::setDisplayName(const QString &displayName)
+{
+    return QGuiApplication::setApplicationDisplayName(displayName);
+}
+
 int screens_count(QQmlListProperty<QQuickScreenInfo> *prop)
 {
     return static_cast<QVector<QQuickScreenInfo *> *>(prop->data)->count();
diff --git a/src/quick/util/qquickapplication_p.h b/src/quick/util/qquickapplication_p.h
index 70381553b4..8ee203f0da 100644
--- a/src/quick/util/qquickapplication_p.h
+++ b/src/quick/util/qquickapplication_p.h
@@ -68,6 +68,7 @@ class Q_AUTOTEST_EXPORT QQuickApplication : public QQmlApplication
     Q_PROPERTY(bool supportsMultipleWindows READ supportsMultipleWindows CONSTANT)
     Q_PROPERTY(Qt::ApplicationState state READ state NOTIFY stateChanged)
     Q_PROPERTY(QFont font READ font CONSTANT)
+    Q_PROPERTY(QString displayName READ displayName WRITE setDisplayName NOTIFY displayNameChanged)
     Q_PROPERTY(QQmlListProperty<QQuickScreenInfo> screens READ screens NOTIFY screensChanged)
 
 public:
@@ -79,9 +80,12 @@ public:
     Qt::ApplicationState state() const;
     QFont font() const;
     QQmlListProperty<QQuickScreenInfo> screens();
+    QString displayName() const;
+    void setDisplayName(const QString &displayName);
 
 Q_SIGNALS:
     void activeChanged();
+    void displayNameChanged();
     void layoutDirectionChanged();
     void stateChanged(Qt::ApplicationState state);
     void screensChanged();