diff options
| author | Bernd Weimer <bernd.weimer@pelagicore.com> | 2019-07-02 16:06:50 +0200 |
|---|---|---|
| committer | Bernd Weimer <bernd.weimer@pelagicore.com> | 2019-08-01 13:21:03 +0200 |
| commit | 93bc72664091403d3c1cbd64274faf3ef31cc902 (patch) | |
| tree | ac27e7d35e8f2acb4887fa9599337c267d65adf0 | |
| parent | 1df51a44f4303410d255fa6b2aacc536fedd58ac (diff) | |
Fix possibly crashing qml/simple tests
Cherry-picked from dev: 6482d3d
Change-Id: If5f52f8fcf6f06bb0a4b9820c48b2ae9123f1e90
Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>
| -rw-r--r-- | tests/qml/simple/tst_applicationmanager.qml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/qml/simple/tst_applicationmanager.qml b/tests/qml/simple/tst_applicationmanager.qml index 2581d66c..d5c3787e 100644 --- a/tests/qml/simple/tst_applicationmanager.qml +++ b/tests/qml/simple/tst_applicationmanager.qml @@ -127,7 +127,7 @@ TestCase { var id = simpleApplication.id; compare(simpleApplication.id, "tld.test.simple1") compare(simpleApplication.runtimeName, "qml") - compare(simpleApplication.icon, Qt.resolvedUrl("apps/tld.test.simple1/icon.png")) + compare(simpleApplication.icon.toString(), Qt.resolvedUrl("apps/tld.test.simple1/icon.png")) compare(simpleApplication.documentUrl, "") compare(simpleApplication.builtIn, true) compare(simpleApplication.alias, false) @@ -158,7 +158,7 @@ TestCase { compare(applicationAlias.alias, true) compare(applicationAlias.nonAliased, simpleApplication) //TODO this should be a Url instead, as this is what's used in QML usually - compare(applicationAlias.icon, Qt.resolvedUrl("apps/tld.test.simple1/icon2.png")) + compare(applicationAlias.icon.toString(), Qt.resolvedUrl("apps/tld.test.simple1/icon2.png")) compare(applicationAlias.documentUrl, "x-test:alias") compare(applicationAlias.runtimeName, simpleApplication.runtimeName) compare(applicationAlias.capabilities, simpleApplication.capabilities) @@ -193,7 +193,7 @@ TestCase { compare(listView.currentItem.modelData.application, simpleApplication) compare(listView.currentItem.modelData.applicationId, simpleApplication.id) compare(listView.currentItem.modelData.name, "Simple1") - compare(listView.currentItem.modelData.icon, Qt.resolvedUrl(simpleApplication.icon)) + compare(listView.currentItem.modelData.icon.toString(), Qt.resolvedUrl(simpleApplication.icon)) compare(listView.currentItem.modelData.runtimeName, "qml") compare(listView.currentItem.modelData.isRunning, false) compare(listView.currentItem.modelData.isStartingUp, false) @@ -273,7 +273,7 @@ TestCase { compare(appData.application, simpleApplication) compare(appData.applicationId, simpleApplication.id) compare(appData.name, "Simple1") - compare(appData.icon, Qt.resolvedUrl(simpleApplication.icon)) + compare(appData.icon.toString(), Qt.resolvedUrl(simpleApplication.icon)) compare(appData.runtimeName, "qml") compare(appData.isRunning, false) compare(appData.isStartingUp, false) |