git.iko.soy/unity8
on xenial help sign in
Fix tst_DragHandle
commit414a18dce4a9f69ec3a1c9e0187998ba70e0831d authorDaniel d'Andrada <daniel.dandrada@canonical.com> dateMon 8 Dec 2014, 16:06 (12 years ago) parent9459bae
2 files changed+5−2
compare with xenial
unifiedsplit
tests/qmltests/Components/tst_DragHandle.cpp+4 tests/qmltests/Components/tst_DragHandle.qml+1−2
tests/qmltests/Components/tst_DragHandle.cpp+4
@@ -101,6 +101,10 @@ void tst_DragHandle::init()
101101 QVERIFY(m_view->rootObject() != 0);
102102 qApp->processEvents();
103103
104+ // Hide the controls to ensure we don't hit them accidentally
105+ QQuickItem *controls = m_view->rootObject()->findChild<QQuickItem*>("controls");
106+ controls->setVisible(false);
107+
104108 m_fakeTimer = new FakeTimer;
105109 m_fakeTimeSource.reset(new FakeTimeSource);
106110}
tests/qmltests/Components/tst_DragHandle.qml+1−2
@@ -156,13 +156,13 @@ Rectangle {
156156 }
157157
158158 Row {
159+ objectName: "controls"
159160 anchors.bottom: parent.bottom
160161 anchors.left: parent.left
161162 anchors.margins: units.gu(1)
162163 spacing: units.gu(1)
163164
164165 Button {
165− id: stretchButton
166166 text: root.stretch ? "stretch" : "move"
167167 onClicked: { root.stretch = !root.stretch; }
168168 }
@@ -190,7 +190,6 @@ Rectangle {
190190 }
191191
192192 Button {
193− id: bidirectionalButton
194193 text: root.bidirectional ? "bidirectional" : "directional"
195194 onClicked: { root.bidirectional = !root.bidirectional; }
196195 }