Enable tests for boot2qt

The tests for boot2qt were disabled with commit
cc7fb64d321c4884caee0cfd29bd2de0b1b3eaeb. The tests can
be enabled since qtdeclarative now fallbacks to software
renderer if OpenGL is not supported.

Also some timings needed to be relaxed for the tests to
pass when running on Qemu.

Task-number: QTBUG-60268
Change-Id: I8f933511c956b728a76870231a58ed89398a75ba
Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>

4 files changed, 14 insertions, 10 deletions

diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index d97af779..1229874a 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -62,9 +62,6 @@ qtHaveModule(location) {
                 declarative_geoshape
 
         !mac: SUBDIRS += declarative_ui
-
-        # QTBUG-60268
-        boot2qt: SUBDIRS -= declarative_ui
     }
 }
 
diff --git a/tests/auto/declarative_ui/tst_map_flick.qml b/tests/auto/declarative_ui/tst_map_flick.qml
index c153411f..ba10d12e 100644
--- a/tests/auto/declarative_ui/tst_map_flick.qml
+++ b/tests/auto/declarative_ui/tst_map_flick.qml
@@ -170,7 +170,7 @@ Item {
             map.center.longitude = 11
             mousePress(page, 0, 50)
             for (var i = 0; i < 50; i += 5) {
-                wait(20)
+                wait(25)
                 mouseMove(page, 0, (50 + i), 0, Qt.LeftButton);
             }
             mouseRelease(page, 0, 100)
@@ -207,7 +207,7 @@ Item {
             map.center.longitude = 11
             mousePress(page, 10, 95)
             for (var i = 45; i > 0; i -= 5) {
-                wait(20)
+                wait(25)
                 mouseMove(page, 10, (50 + i), 0, Qt.LeftButton);
             }
             mouseRelease(page, 10, 50)
@@ -242,7 +242,7 @@ Item {
             mousePress(page, pos, pos)
             for (var i = pos; i < 50; i += 5) {
                 pos = i
-                wait(20)
+                wait(25)
                 mouseMove(page, pos, pos, 0, Qt.LeftButton);
             }
             mouseRelease(page, pos, pos)
@@ -263,7 +263,7 @@ Item {
             map.center.longitude = 50
             mousePress(page, 0, 0)
             for (var i = 0; i < 50; i += 5) {
-                wait(20)
+                wait(25)
                 mouseMove(page, i, i, 0, Qt.LeftButton);
             }
             mouseRelease(page, 50, 50)
@@ -290,7 +290,7 @@ Item {
             map.center.longitude = 50
             mousePress(page, 0, 0)
             for (var i = 0; i < 50; i += 5) {
-                wait(20)
+                wait(25)
                 mouseMove(page, i, i, 0, Qt.LeftButton);
             }
             mouseRelease(page, 50, 50)
@@ -324,7 +324,7 @@ Item {
             map.center.longitude = 50
             mousePress(page, 0, 0)
             for (var i = 0; i < 50; i += 5) {
-                wait(20)
+                wait(25)
                 mouseMove(page, i, i, 0, Qt.LeftButton);
             }
             mouseRelease(page, 50, 50)
diff --git a/tests/auto/nokia_services/routing/tst_routing.cpp b/tests/auto/nokia_services/routing/tst_routing.cpp
index c214556f..833c95af 100644
--- a/tests/auto/nokia_services/routing/tst_routing.cpp
+++ b/tests/auto/nokia_services/routing/tst_routing.cpp
@@ -234,7 +234,8 @@ void tst_nokia_routing::calculateRoute()
     m_routingManager->calculateRoute(m_dummyRequest);
     m_replyUnowned->complete();
     m_replyUnowned = 0;
-    QTRY_VERIFY_WITH_TIMEOUT(m_calculationDone, 100);
+    // Timeout of 200ms is required for slow targets (e.g. Qemu)
+    QTRY_VERIFY_WITH_TIMEOUT(m_calculationDone, 200);
 }
 
 void tst_nokia_routing::onReply(QGeoRouteReply* reply)
diff --git a/tests/auto/qgeotiledmap/tst_qgeotiledmap.cpp b/tests/auto/qgeotiledmap/tst_qgeotiledmap.cpp
index 7eb1ed51..14b40eb6 100644
--- a/tests/auto/qgeotiledmap/tst_qgeotiledmap.cpp
+++ b/tests/auto/qgeotiledmap/tst_qgeotiledmap.cpp
@@ -134,6 +134,8 @@ void tst_QGeoTiledMap::fetchTiles()
 
     //prev_visible
     camera.setZoomLevel(zoomLevel-1);
+    // Delay needed on slow targets (e.g. Qemu)
+    QTest::qWait(10);
     m_map->clearData();
     m_tilesCounter->m_tiles.clear();
     m_map->setCameraData(camera);
@@ -142,6 +144,8 @@ void tst_QGeoTiledMap::fetchTiles()
 
     //visible + prefetch
     camera.setZoomLevel(zoomLevel);
+    // Delay needed on slow targets (e.g. Qemu)
+    QTest::qWait(10);
     m_map->clearData();
     m_tilesCounter->m_tiles.clear();
     m_map->setCameraData(camera);
@@ -155,6 +159,8 @@ void tst_QGeoTiledMap::fetchTiles()
 
     //next visible
     camera.setZoomLevel(zoomLevel + 1);
+    // Delay needed on slow targets (e.g. Qemu)
+    QTest::qWait(10);
     m_map->clearData();
     m_tilesCounter->m_tiles.clear();
     m_map->setCameraData(camera);