Merge remote-tracking branch 'origin/5.12' into dev

 Conflicts:
	.qmake.conf

Change-Id: I00453b819d65460dabf771617e6181275461cc78

2 files changed, 4 insertions, 3 deletions

diff --git a/tests/auto/declarative_core/tst_categorymodel.qml b/tests/auto/declarative_core/tst_categorymodel.qml
index 0b6e50a3..86d0fd4c 100644
--- a/tests/auto/declarative_core/tst_categorymodel.qml
+++ b/tests/auto/declarative_core/tst_categorymodel.qml
@@ -221,7 +221,7 @@ TestCase {
         //iteration.
 
         //try updating with an uninitialized plugin instance.
-        testModel.plugin = uninitializedPlugin;
+        testModel.plugin = uninitializedPlugin; // uninitialized does not trigger update on setPlugin
         testModel.update();
         tryCompare(statusChangedSpy, "count", 2);
         compare(testModel.status, CategoryModel.Error);
@@ -229,8 +229,9 @@ TestCase {
 
         //try searching with plugin a instance
         //that has been provided a non-existent name
+        tryCompare(statusChangedSpy, "count", 0);
         testModel.plugin = nonExistantPlugin;
-        testModel.update();
+//        testModel.update(); //QTBUG-70254
         tryCompare(statusChangedSpy, "count", 2);
         compare(testModel.status, CategoryModel.Error);
     }
diff --git a/tests/auto/qgeopath/tst_qgeopath.cpp b/tests/auto/qgeopath/tst_qgeopath.cpp
index 213af0ad..47badf73 100644
--- a/tests/auto/qgeopath/tst_qgeopath.cpp
+++ b/tests/auto/qgeopath/tst_qgeopath.cpp
@@ -182,7 +182,7 @@ void tst_QGeoPath::path()
         QCOMPARE(p.path().contains(c), true);
     }
 
-    p.clear();
+    p.clearPath();
     QCOMPARE(p.path().size(), 0);
     QVERIFY(p.boundingGeoRectangle().isEmpty());
 }