on xenial help sign in
merge with prereq
d4a8cb9Michael Zanetti
qml/Launcher/Launcher.qml−1
@@ -154,7 +154,6 @@ FocusScope {
154
154
155 function openDrawer(focusInputField) {
155 function openDrawer(focusInputField) {
156 if (!drawerEnabled) {
156 if (!drawerEnabled) {
157− print("bam!")
158 return;
157 return;
159 }
158 }
160
159
tests/qmltests/Launcher/tst_Drawer.qml+2−2
@@ -268,9 +268,9 @@ StyledItem {
268 tryCompare(drawer, "focus", true);
268 tryCompare(drawer, "focus", true);
269
269
270 var searchField = findChild(drawer, "searchField");
270 var searchField = findChild(drawer, "searchField");
271− verify(searchField);
271+ tryCompareFunction(function() { return !!searchField }, true);
272 typeString("cam");
272 typeString("cam");
273− tryCompare(searchField, "displayText", "cam");
273+ tryCompareFunction(function() { return searchField.displayText }, "cam");
274 }
274 }
275
275
276 function test_kbdNavigation() {
276 function test_kbdNavigation() {