diff options
author | J-P Nurmi <jpnurmi@digia.com> | 2013-06-21 15:08:43 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-06-29 11:51:03 +0200 |
commit | 101a5185138f4eb4d1ed0e69065d8e4c30a7fff7 (patch) | |
tree | f76f32cedfd5d509c86be149359d6b9525c64d3c /tests | |
parent | a1922317f8b2c219176553ff3f0db815f6f16cfd (diff) |
Add Qt.application.organization/domain
Change-Id: Ic4a161b59d51e621e13c960f104d1a3be2ee64f8
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/qml/qqmlapplicationengine/data/applicationTest.qml | 8 | ||||
-rw-r--r-- | tests/auto/qml/qqmlapplicationengine/tst_qqmlapplicationengine.cpp | 16 |
2 files changed, 24 insertions, 0 deletions
diff --git a/tests/auto/qml/qqmlapplicationengine/data/applicationTest.qml b/tests/auto/qml/qqmlapplicationengine/data/applicationTest.qml index 2a1b4fbf57..1957edaf56 100644 --- a/tests/auto/qml/qqmlapplicationengine/data/applicationTest.qml +++ b/tests/auto/qml/qqmlapplicationengine/data/applicationTest.qml @@ -3,12 +3,20 @@ import QtQml 2.0 QtObject { property string originalName property string originalVersion + property string originalOrganization + property string originalDomain property string currentName: Qt.application.name property string currentVersion: Qt.application.version + property string currentOrganization: Qt.application.organization + property string currentDomain: Qt.application.domain Component.onCompleted: { originalName = Qt.application.name originalVersion = Qt.application.version + originalOrganization = Qt.application.organization + originalDomain = Qt.application.domain Qt.application.name = "Test B" Qt.application.version = "0.0B" + Qt.application.organization = "Org B" + Qt.application.domain = "b.org" } } diff --git a/tests/auto/qml/qqmlapplicationengine/tst_qqmlapplicationengine.cpp b/tests/auto/qml/qqmlapplicationengine/tst_qqmlapplicationengine.cpp index 4780ee0310..c0c3f736b9 100644 --- a/tests/auto/qml/qqmlapplicationengine/tst_qqmlapplicationengine.cpp +++ b/tests/auto/qml/qqmlapplicationengine/tst_qqmlapplicationengine.cpp @@ -132,26 +132,42 @@ void tst_qqmlapplicationengine::applicationProperties() QCoreApplication* coreApp = QCoreApplication::instance(); QString originalName = coreApp->applicationName(); QString originalVersion = coreApp->applicationVersion(); + QString originalOrganization = coreApp->organizationName(); + QString originalDomain = coreApp->organizationDomain(); QString firstName = QLatin1String("Test A"); QString firstVersion = QLatin1String("0.0A"); + QString firstOrganization = QLatin1String("Org A"); + QString firstDomain = QLatin1String("a.org"); QString secondName = QLatin1String("Test B"); QString secondVersion = QLatin1String("0.0B"); + QString secondOrganization = QLatin1String("Org B"); + QString secondDomain = QLatin1String("b.org"); coreApp->setApplicationName(firstName); coreApp->setApplicationVersion(firstVersion); + coreApp->setOrganizationName(firstOrganization); + coreApp->setOrganizationDomain(firstDomain); QQmlApplicationEngine *test = new QQmlApplicationEngine(testFileUrl("applicationTest.qml")); QObject* root = test->rootObjects().at(0); QVERIFY(root); QCOMPARE(root->property("originalName").toString(), firstName); QCOMPARE(root->property("originalVersion").toString(), firstVersion); + QCOMPARE(root->property("originalOrganization").toString(), firstOrganization); + QCOMPARE(root->property("originalDomain").toString(), firstDomain); QCOMPARE(root->property("currentName").toString(), secondName); QCOMPARE(root->property("currentVersion").toString(), secondVersion); + QCOMPARE(root->property("currentOrganization").toString(), secondOrganization); + QCOMPARE(root->property("currentDomain").toString(), secondDomain); QCOMPARE(coreApp->applicationName(), secondName); QCOMPARE(coreApp->applicationVersion(), secondVersion); + QCOMPARE(coreApp->organizationName(), secondOrganization); + QCOMPARE(coreApp->organizationDomain(), secondDomain); coreApp->setApplicationName(originalName); coreApp->setApplicationVersion(originalVersion); + coreApp->setOrganizationName(originalOrganization); + coreApp->setOrganizationDomain(originalDomain); delete test; } |