diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2013-07-04 17:36:14 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-04 20:52:48 +0200 |
| commit | 8cc60ac9cc33192d8a0bc8ce9412fe059830eabd (patch) | |
| tree | 0608af5fc653a5300e5da5969a7bd0914962e548 /tests/auto/qml/qqmlapplicationengine | |
| parent | ea045d82a3a837f83fec82462feebf2bc262f9d9 (diff) | |
Fix Qt.application.xxx notifier signals
QCoreApplication now provides change notifications.
Change-Id: Icd7e1247426f4b5ad124d6d9b72a2ba99225ee08
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Diffstat (limited to 'tests/auto/qml/qqmlapplicationengine')
| -rw-r--r-- | tests/auto/qml/qqmlapplicationengine/data/applicationTest.qml | 1 | ||||
| -rw-r--r-- | tests/auto/qml/qqmlapplicationengine/tst_qqmlapplicationengine.cpp | 13 |
2 files changed, 14 insertions, 0 deletions
diff --git a/tests/auto/qml/qqmlapplicationengine/data/applicationTest.qml b/tests/auto/qml/qqmlapplicationengine/data/applicationTest.qml index 1957edaf56..53a93621bb 100644 --- a/tests/auto/qml/qqmlapplicationengine/data/applicationTest.qml +++ b/tests/auto/qml/qqmlapplicationengine/data/applicationTest.qml @@ -9,6 +9,7 @@ QtObject { property string currentVersion: Qt.application.version property string currentOrganization: Qt.application.organization property string currentDomain: Qt.application.domain + property QtObject applicationInstance: Qt.application Component.onCompleted: { originalName = Qt.application.name originalVersion = Qt.application.version diff --git a/tests/auto/qml/qqmlapplicationengine/tst_qqmlapplicationengine.cpp b/tests/auto/qml/qqmlapplicationengine/tst_qqmlapplicationengine.cpp index c0c3f736b9..489972716d 100644 --- a/tests/auto/qml/qqmlapplicationengine/tst_qqmlapplicationengine.cpp +++ b/tests/auto/qml/qqmlapplicationengine/tst_qqmlapplicationengine.cpp @@ -164,10 +164,23 @@ void tst_qqmlapplicationengine::applicationProperties() QCOMPARE(coreApp->organizationName(), secondOrganization); QCOMPARE(coreApp->organizationDomain(), secondDomain); + QObject* application = root->property("applicationInstance").value<QObject*>(); + QVERIFY(application); + QSignalSpy nameChanged(application, SIGNAL(nameChanged())); + QSignalSpy versionChanged(application, SIGNAL(versionChanged())); + QSignalSpy organizationChanged(application, SIGNAL(organizationChanged())); + QSignalSpy domainChanged(application, SIGNAL(domainChanged())); + coreApp->setApplicationName(originalName); coreApp->setApplicationVersion(originalVersion); coreApp->setOrganizationName(originalOrganization); coreApp->setOrganizationDomain(originalDomain); + + QCOMPARE(nameChanged.count(), 1); + QCOMPARE(versionChanged.count(), 1); + QCOMPARE(organizationChanged.count(), 1); + QCOMPARE(domainChanged.count(), 1); + delete test; } |