From 82a5bb18d201bc8d2f4c0df6573bcfcefd64e73a Mon Sep 17 00:00:00 2001
From: Benjamin Terrier <b.terrier@gmail.com>
Date: Fri, 30 Sep 2016 11:25:02 +0200
Subject: 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>
---
 .../qquickapplication/data/tst_displayname.qml     |  7 ++++++
 .../quick/qquickapplication/qquickapplication.pro  |  6 +++++
 .../qquickapplication/tst_qquickapplication.cpp    | 27 +++++++++++++++++++++-
 3 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 tests/auto/quick/qquickapplication/data/tst_displayname.qml

(limited to 'tests/auto/quick/qquickapplication')

diff --git a/tests/auto/quick/qquickapplication/data/tst_displayname.qml b/tests/auto/quick/qquickapplication/data/tst_displayname.qml
new file mode 100644
index 0000000000..f43beaf6de
--- /dev/null
+++ b/tests/auto/quick/qquickapplication/data/tst_displayname.qml
@@ -0,0 +1,7 @@
+import QtQuick 2.0;
+
+Item {
+    id: root;
+    property string displayName: Qt.application.displayName;
+    function updateDisplayName(name) { Qt.application.displayName = name; }
+}
diff --git a/tests/auto/quick/qquickapplication/qquickapplication.pro b/tests/auto/quick/qquickapplication/qquickapplication.pro
index 59445a6c16..c47f5472b7 100644
--- a/tests/auto/quick/qquickapplication/qquickapplication.pro
+++ b/tests/auto/quick/qquickapplication/qquickapplication.pro
@@ -3,5 +3,11 @@ TARGET = tst_qquickapplication
 macx:CONFIG -= app_bundle
 
 SOURCES += tst_qquickapplication.cpp
+OTHER_FILES += data/tst_displayname.qml
+
+include (../../shared/util.pri)
+
+TESTDATA = data/*
+
 QT += core-private gui-private qml quick qml-private quick-private testlib
 
diff --git a/tests/auto/quick/qquickapplication/tst_qquickapplication.cpp b/tests/auto/quick/qquickapplication/tst_qquickapplication.cpp
index 114f906736..d780b91260 100644
--- a/tests/auto/quick/qquickapplication/tst_qquickapplication.cpp
+++ b/tests/auto/quick/qquickapplication/tst_qquickapplication.cpp
@@ -36,8 +36,9 @@
 #include <qpa/qwindowsysteminterface.h>
 #include <qpa/qplatformintegration.h>
 #include <private/qguiapplication_p.h>
+#include "../../shared/util.h"
 
-class tst_qquickapplication : public QObject
+class tst_qquickapplication : public QQmlDataTest
 {
     Q_OBJECT
 public:
@@ -51,6 +52,7 @@ private slots:
     void inputMethod();
     void styleHints();
     void cleanup();
+    void displayName();
 
 private:
     QQmlEngine engine;
@@ -239,6 +241,29 @@ void tst_qquickapplication::styleHints()
     QCOMPARE(qvariant_cast<QObject*>(item->property("styleHints")), qApp->styleHints());
 }
 
+void tst_qquickapplication::displayName()
+{
+    QString name[3] = { QStringLiteral("APP NAME 0"),
+                        QStringLiteral("APP NAME 1"),
+                        QStringLiteral("APP NAME 2")
+                      };
+
+    QQmlComponent component(&engine, testFileUrl("tst_displayname.qml"));
+    QQuickItem *item = qobject_cast<QQuickItem *>(component.create());
+    QVERIFY(item);
+    QQuickView view;
+    item->setParentItem(view.rootObject());
+
+    QCoreApplication::setApplicationName(name[0]);
+    QCOMPARE(qvariant_cast<QString>(item->property("displayName")), name[0]);
+
+    QGuiApplication::setApplicationName(name[1]);
+    QCOMPARE(qvariant_cast<QString>(item->property("displayName")), name[1]);
+
+    QMetaObject::invokeMethod(item, "updateDisplayName", Q_ARG(QVariant, QVariant(name[2])));
+    QCOMPARE(QGuiApplication::applicationDisplayName(), name[2]);
+}
+
 QTEST_MAIN(tst_qquickapplication)
 
 #include "tst_qquickapplication.moc"
-- 
cgit v1.2.3