git.iko.soy/unity8
on xenial help sign in
Really only do this for make tryGenericScopeView
5f5d224Albert Astals Cid
tests/qmltests/Dash/tst_GenericScopeView.qml+2−1
compare with xenial
unifiedsplit
@@ -22,6 +22,7 @@ import "../../../qml/Dash"
22import "../../../qml/Components"
22import "../../../qml/Components"
23import Ubuntu.Components 1.3
23import Ubuntu.Components 1.3
24import Unity.Test 0.1 as UT
24import Unity.Test 0.1 as UT
25+import Qt.test.qtestroot 1.0
25
26
26Item {
27Item {
27 id: shell
28 id: shell
@@ -41,7 +42,7 @@ Item {
41 id: scopes
42 id: scopes
42 // for tryGenericScopeView
43 // for tryGenericScopeView
43 onLoadedChanged: {
44 onLoadedChanged: {
44− if (loaded && !testCase.running) {
45+ if (loaded && UT.Util.isInstanceOf(QTestRootObject, "DummyTestRootObject")) {
45 genericScopeView.scope = scopes.getScope(2);
46 genericScopeView.scope = scopes.getScope(2);
46 genericScopeView.isCurrent = true;
47 genericScopeView.isCurrent = true;
47 }
48 }