git.iko.soy/unity8
on xenial help sign in
Make fake TestView more obviously intentionally-blank
026d77eMichael Terry
tests/qmltests/Greeter/TestView.qml+6
compare with xenial
unifiedsplit
@@ -83,5 +83,11 @@ Item {
83 Rectangle {
83 Rectangle {
84 anchors.fill: parent
84 anchors.fill: parent
85 color: "black"
85 color: "black"
86+
87+ Label {
88+ text: "Fake view, nothing to see here"
89+ color: "white"
90+ anchors.centerIn: parent
91+ }
86 }
92 }
87}
93}
tests/qmltests/Greeter/tst_Greeter.qml+14−37
@@ -36,47 +36,24 @@ Item {
36 loader.active = true;
36 loader.active = true;
37 }
37 }
38
38
39− Row {
40− anchors.fill: parent
41− Loader {
39+ Loader {
42− id: loader
40+ id: loader
43−
44− active: false
45− width: parent.width - controls.width
46− height: parent.height
47−
48− property bool itemDestroyed: false
49− sourceComponent: Component {
50− Greeter {
51− width: loader.width
52− height: loader.height
53− background: defaultBackground
54− viewSource: Qt.resolvedUrl("TestView.qml")
55−
56− Component.onDestruction: {
57− loader.itemDestroyed = true;
58− }
59− }
60− }
61− }
62
41
63− Rectangle {
42+ active: false
64− id: controls
43+ anchors.fill: parent
65− color: "white"
66− width: units.gu(40)
67− height: parent.height
68
44
69− Column {
45+ property bool itemDestroyed: false
70− anchors { left: parent.left; right: parent.right; top: parent.top; margins: units.gu(1) }
46+ sourceComponent: Component {
71− spacing: units.gu(1)
47+ Greeter {
48+ width: loader.width
49+ height: loader.height
50+ background: defaultBackground
51+ viewSource: Qt.resolvedUrl("TestView.qml")
72
52
73− Row {
53+ Component.onDestruction: {
74− Button {
54+ loader.itemDestroyed = true;
75− text: "Show Greeter"
76− onClicked: loader.item.show()
77− }
78 }
55 }
79− }
56+ }
80 }
57 }
81 }
58 }
82
59