Merge dev into 5.8

Change-Id: If0f273d3d33cec20edda539de6372337c2e4e969

57 files changed, 521 insertions, 439 deletions

diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index b72a43d742..556f5ddc7a 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -8,12 +8,15 @@ SUBDIRS=\
     installed_cmake \
     toolsupport
 
-qtHaveModule(gui):contains(QT_CONFIG, opengl(es1|es2)?) {
+qtHaveModule(gui):qtConfig(opengl(es1|es2)?) {
     SUBDIRS += particles
     qtHaveModule(widgets): SUBDIRS += quickwidgets
 
 }
 
+# console applications not supported
+uikit: SUBDIRS -= qmltest
+
 qmldevtools.CONFIG = host_build
 
 installed_cmake.depends = cmake
diff --git a/tests/auto/particles/particles.pro b/tests/auto/particles/particles.pro
index 265a1eabc7..6ee1290dbb 100644
--- a/tests/auto/particles/particles.pro
+++ b/tests/auto/particles/particles.pro
@@ -25,6 +25,5 @@ PRIVATETESTS += \
     qquickturbulence \
     qquickwander
 
-contains(QT_CONFIG, private_tests) {
+qtConfig(private_tests): \
     SUBDIRS += $$PRIVATETESTS
-}
diff --git a/tests/auto/particles/qquickage/tst_qquickage.cpp b/tests/auto/particles/qquickage/tst_qquickage.cpp
index 04c6fbd9e4..a233b30043 100644
--- a/tests/auto/particles/qquickage/tst_qquickage.cpp
+++ b/tests/auto/particles/qquickage/tst_qquickage.cpp
@@ -61,7 +61,7 @@ void tst_qquickage::test_kill()
     ensureAnimTime(600, system->m_animation);
 
     QVERIFY(extremelyFuzzyCompare(system->groupData[0]->size(), 500, 10));
-    foreach (QQuickParticleData *d, system->groupData[0]->data) {
+    for (QQuickParticleData *d : qAsConst(system->groupData[0]->data)) {
         if (d->t == -1)
             continue; //Particle data unused
 
@@ -86,7 +86,7 @@ void tst_qquickage::test_jump()
     ensureAnimTime(600, system->m_animation);
 
     QVERIFY(extremelyFuzzyCompare(system->groupData[0]->size(), 500, 10));
-    foreach (QQuickParticleData *d, system->groupData[0]->data) {
+    for (QQuickParticleData *d : qAsConst(system->groupData[0]->data)) {
         if (d->t == -1)
             continue; //Particle data unused
 
@@ -112,7 +112,7 @@ void tst_qquickage::test_onceOff()
     ensureAnimTime(600, system->m_animation);
 
     QVERIFY(extremelyFuzzyCompare(system->groupData[0]->size(), 500, 10));
-    foreach (QQuickParticleData *d, system->groupData[0]->data) {
+    for (QQuickParticleData *d : qAsConst(system->groupData[0]->data)) {
         if (d->t == -1)
             continue; //Particle data unused
 
@@ -138,7 +138,7 @@ void tst_qquickage::test_sustained()
     //TODO: Ensure some particles have lived to 0.4s point despite unified timer
 
     //Can't verify size, because particles never die. It will constantly grow.
-    foreach (QQuickParticleData *d, system->groupData[0]->data) {
+    for (QQuickParticleData *d : qAsConst(system->groupData[0]->data)) {
         if (d->t == -1)
             continue; //Particle data unused
 
diff --git a/tests/auto/particles/qquickangleddirection/tst_qquickangleddirection.cpp b/tests/auto/particles/qquickangleddirection/tst_qquickangleddirection.cpp
index 4ff72f159d..b3fc01caa6 100644
--- a/tests/auto/particles/qquickangleddirection/tst_qquickangleddirection.cpp
+++ b/tests/auto/particles/qquickangleddirection/tst_qquickangleddirection.cpp
@@ -58,7 +58,7 @@ void tst_qquickangleddirection::test_basic()
     ensureAnimTime(600, system->m_animation);
 
     QVERIFY(extremelyFuzzyCompare(system->groupData[0]->size(), 500, 10));
-    foreach (QQuickParticleData *d, system->groupData[0]->data) {
+    for (QQuickParticleData *d : qAsConst(system->groupData[0]->data)) {
         if (d->t == -1)
             continue; //Particle data unused
 
diff --git a/tests/auto/particles/qquickcumulativedirection/tst_qquickcumulativedirection.cpp b/tests/auto/particles/qquickcumulativedirection/tst_qquickcumulativedirection.cpp
index 795fcaf42e..360b222367 100644
--- a/tests/auto/particles/qquickcumulativedirection/tst_qquickcumulativedirection.cpp
+++ b/tests/auto/particles/qquickcumulativedirection/tst_qquickcumulativedirection.cpp
@@ -57,7 +57,7 @@ void tst_qquickcumulativedirection::test_basic()
     ensureAnimTime(600, system->m_animation);
 
     QVERIFY(extremelyFuzzyCompare(system->groupData[0]->size(), 500, 10));
-    foreach (QQuickParticleData *d, system->groupData[0]->data) {
+    for (QQuickParticleData *d : qAsConst(system->groupData[0]->data)) {
         if (d->t == -1)
             continue; //Particle data unused
 
diff --git a/tests/auto/particles/qquickcustomaffector/tst_qquickcustomaffector.cpp b/tests/auto/particles/qquickcustomaffector/tst_qquickcustomaffector.cpp
index fb15af4dd1..ee05fb29c9 100644
--- a/tests/auto/particles/qquickcustomaffector/tst_qquickcustomaffector.cpp
+++ b/tests/auto/particles/qquickcustomaffector/tst_qquickcustomaffector.cpp
@@ -59,7 +59,7 @@ void tst_qquickcustomaffector::test_basic()
     ensureAnimTime(600, system->m_animation);
 
     QVERIFY(extremelyFuzzyCompare(system->groupData[0]->size(), 500, 10));
-    foreach (QQuickParticleData *d, system->groupData[0]->data) {
+    for (QQuickParticleData *d : qAsConst(system->groupData[0]->data)) {
         if (d->t == -1)
             continue; //Particle data unused
         //in CI the whole simulation often happens at once, so dead particles end up missing out
@@ -92,7 +92,7 @@ void tst_qquickcustomaffector::test_move()
     ensureAnimTime(600, system->m_animation);
 
     QVERIFY(extremelyFuzzyCompare(system->groupData[0]->size(), 500, 10));
-    foreach (QQuickParticleData *d, system->groupData[0]->data) {
+    for (QQuickParticleData *d : qAsConst(system->groupData[0]->data)) {
         if (d->t == -1)
             continue; //Particle data unused
         if (!d->stillAlive(system))
diff --git a/tests/auto/particles/qquickcustomparticle/tst_qquickcustomparticle.cpp b/tests/auto/particles/qquickcustomparticle/tst_qquickcustomparticle.cpp
index a722508a3e..60c6a37899 100644
--- a/tests/auto/particles/qquickcustomparticle/tst_qquickcustomparticle.cpp
+++ b/tests/auto/particles/qquickcustomparticle/tst_qquickcustomparticle.cpp
@@ -60,7 +60,7 @@ void tst_qquickcustomparticle::test_basic()
 
     bool oneNonZero = false;
     QVERIFY(extremelyFuzzyCompare(system->groupData[0]->size(), 500, 10));
-    foreach (QQuickParticleData *d, system->groupData[0]->data) {
+    for (QQuickParticleData *d : qAsConst(system->groupData[0]->data)) {
         if (d->t == -1)
             continue; //Particle data unused
 
diff --git a/tests/auto/particles/qquickellipseextruder/tst_qquickellipseextruder.cpp b/tests/auto/particles/qquickellipseextruder/tst_qquickellipseextruder.cpp
index ac8e2bac49..a1fe5b225d 100644
--- a/tests/auto/particles/qquickellipseextruder/tst_qquickellipseextruder.cpp
+++ b/tests/auto/particles/qquickellipseextruder/tst_qquickellipseextruder.cpp
@@ -74,7 +74,7 @@ void tst_qquickellipseextruder::test_basic()
 
     //Filled
     QVERIFY(extremelyFuzzyCompare(system->groupData[0]->size(), 500, 10));
-    foreach (QQuickParticleData *d, system->groupData[0]->data) {
+    for (QQuickParticleData *d : qAsConst(system->groupData[0]->data)) {
         if (d->t == -1)
             continue; //Particle data unused
 
@@ -91,7 +91,7 @@ void tst_qquickellipseextruder::test_basic()
 
     //Just border
     QCOMPARE(system->groupData[1]->size(), 500);
-    foreach (QQuickParticleData *d, system->groupData[1]->data) {
+    for (QQuickParticleData *d : qAsConst(system->groupData[1]->data)) {
         if (d->t == -1)
             continue; //Particle data unused
 
diff --git a/tests/auto/particles/qquickfriction/tst_qquickfriction.cpp b/tests/auto/particles/qquickfriction/tst_qquickfriction.cpp
index 70e0291330..ab682c591e 100644
--- a/tests/auto/particles/qquickfriction/tst_qquickfriction.cpp
+++ b/tests/auto/particles/qquickfriction/tst_qquickfriction.cpp
@@ -59,7 +59,7 @@ void tst_qquickfriction::test_basic()
 
     //Default is just slowed a little
     QVERIFY(extremelyFuzzyCompare(system->groupData[0]->size(), 500, 10));
-    foreach (QQuickParticleData *d, system->groupData[0]->data) {
+    for (QQuickParticleData *d : qAsConst(system->groupData[0]->data)) {
         if (d->t == -1)
             continue; //Particle data unused
 
@@ -76,7 +76,7 @@ void tst_qquickfriction::test_basic()
 
     //Nondefault comes to a complete stop within the first half of its life
     QCOMPARE(system->groupData[1]->size(), 500);
-    foreach (QQuickParticleData *d, system->groupData[1]->data) {
+    for (QQuickParticleData *d : qAsConst(system->groupData[1]->data)) {
         if (d->t == -1)
             continue; //Particle data unused
 
@@ -103,7 +103,7 @@ void tst_qquickfriction::test_threshold()
 
     //Velocity capped at 50, but it might take a frame or two to get there
     QVERIFY(extremelyFuzzyCompare(system->groupData[0]->size(), 500, 10));
-    foreach (QQuickParticleData *d, system->groupData[0]->data) {
+    for (QQuickParticleData *d : qAsConst(system->groupData[0]->data)) {
         if (d->t == -1.0f)
             continue; //Particle data unused
         if (myFuzzyGEQ(d->t, ((qreal)system->timeInt/1000.0) - 0.1))
diff --git a/tests/auto/particles/qquickgravity/tst_qquickgravity.cpp b/tests/auto/particles/qquickgravity/tst_qquickgravity.cpp
index 8ef075dc9b..34566b90eb 100644
--- a/tests/auto/particles/qquickgravity/tst_qquickgravity.cpp
+++ b/tests/auto/particles/qquickgravity/tst_qquickgravity.cpp
@@ -58,7 +58,7 @@ void tst_qquickgravity::test_basic()
 
     QVERIFY(extremelyFuzzyCompare(system->groupData[0]->size(), 500, 10));
     float mag = 707.10678f;
-    foreach (QQuickParticleData *d, system->groupData[0]->data) {
+    for (QQuickParticleData *d : qAsConst(system->groupData[0]->data)) {
         if (d->t == -1 || !d->stillAlive(system))
             continue; //Particle data unused or dead
 
diff --git a/tests/auto/particles/qquickgroupgoal/tst_qquickgroupgoal.cpp b/tests/auto/particles/qquickgroupgoal/tst_qquickgroupgoal.cpp
index fc270b991f..1228b4cc68 100644
--- a/tests/auto/particles/qquickgroupgoal/tst_qquickgroupgoal.cpp
+++ b/tests/auto/particles/qquickgroupgoal/tst_qquickgroupgoal.cpp
@@ -58,7 +58,7 @@ void tst_qquickgroupgoal::test_instantTransition()
     ensureAnimTime(600, system->m_animation);
 
     QVERIFY(system->groupData[0]->size() <= 500 && system->groupData[0]->size() >= 450);
-    foreach (QQuickParticleData *d, system->groupData[0]->data) {
+    for (QQuickParticleData *d : qAsConst(system->groupData[0]->data)) {
         if (d->t == -1)
             continue; //Particle data unused
 
diff --git a/tests/auto/particles/qquickimageparticle/tst_qquickimageparticle.cpp b/tests/auto/particles/qquickimageparticle/tst_qquickimageparticle.cpp
index cd684ec59b..7e07878d39 100644
--- a/tests/auto/particles/qquickimageparticle/tst_qquickimageparticle.cpp
+++ b/tests/auto/particles/qquickimageparticle/tst_qquickimageparticle.cpp
@@ -72,7 +72,7 @@ void tst_qquickimageparticle::test_basic()
     ensureAnimTime(600, system->m_animation);
 
     QVERIFY(extremelyFuzzyCompare(system->groupData[0]->size(), 500, 10));
-    foreach (QQuickParticleData *d, system->groupData[0]->data) {
+    for (QQuickParticleData *d : qAsConst(system->groupData[0]->data)) {
         if (d->t == -1)
             continue; //Particle data unused
 
@@ -116,7 +116,7 @@ void tst_qquickimageparticle::test_colored()
     ensureAnimTime(600, system->m_animation);
 
     QVERIFY(extremelyFuzzyCompare(system->groupData[0]->size(), 500, 10));
-    foreach (QQuickParticleData *d, system->groupData[0]->data) {
+    for (QQuickParticleData *d : qAsConst(system->groupData[0]->data)) {
         if (d->t == -1)
             continue; //Particle data unused
 
@@ -160,7 +160,7 @@ void tst_qquickimageparticle::test_colorVariance()
     ensureAnimTime(600, system->m_animation);
 
     QVERIFY(extremelyFuzzyCompare(system->groupData[0]->size(), 500, 10));
-    foreach (QQuickParticleData *d, system->groupData[0]->data) {
+    for (QQuickParticleData *d : qAsConst(system->groupData[0]->data)) {
         if (d->t == -1)
             continue; //Particle data unused
 
@@ -205,7 +205,7 @@ void tst_qquickimageparticle::test_deformed()
     ensureAnimTime(600, system->m_animation);
 
     QVERIFY(extremelyFuzzyCompare(system->groupData[0]->size(), 500, 10));
-    foreach (QQuickParticleData *d, system->groupData[0]->data) {
+    for (QQuickParticleData *d : qAsConst(system->groupData[0]->data)) {
         if (d->t == -1)
             continue; //Particle data unused
 
@@ -249,7 +249,7 @@ void tst_qquickimageparticle::test_tabled()
     ensureAnimTime(600, system->m_animation);
 
     QVERIFY(extremelyFuzzyCompare(system->groupData[0]->size(), 500, 10));
-    foreach (QQuickParticleData *d, system->groupData[0]->data) {
+    for (QQuickParticleData *d : qAsConst(system->groupData[0]->data)) {
         if (d->t == -1)
             continue; //Particle data unused
 
@@ -294,7 +294,7 @@ void tst_qquickimageparticle::test_sprite()
     ensureAnimTime(600, system->m_animation);
 
     QVERIFY(extremelyFuzzyCompare(system->groupData[0]->size(), 500, 10));
-    foreach (QQuickParticleData *d, system->groupData[0]->data) {
+    for (QQuickParticleData *d : qAsConst(system->groupData[0]->data)) {
         if (d->t == -1)
             continue; //Particle data unused
 
diff --git a/tests/auto/particles/qquickitemparticle/tst_qquickitemparticle.cpp b/tests/auto/particles/qquickitemparticle/tst_qquickitemparticle.cpp
index 98aac71e93..d9791cdb33 100644
--- a/tests/auto/particles/qquickitemparticle/tst_qquickitemparticle.cpp
+++ b/tests/auto/particles/qquickitemparticle/tst_qquickitemparticle.cpp
@@ -60,7 +60,7 @@ void tst_qquickitemparticle::test_basic()
     ensureAnimTime(600, system->m_animation);
 
     QVERIFY(extremelyFuzzyCompare(system->groupData[0]->size(), 500, 10));
-    foreach (QQuickParticleData *d, system->groupData[0]->data) {
+    for (QQuickParticleData *d : qAsConst(system->groupData[0]->data)) {
         if (d->t == -1)
             continue; //Particle data unused
 
diff --git a/tests/auto/particles/qquicklineextruder/tst_qquicklineextruder.cpp b/tests/auto/particles/qquicklineextruder/tst_qquicklineextruder.cpp
index 1f36874f0f..6baf8539d3 100644
--- a/tests/auto/particles/qquicklineextruder/tst_qquicklineextruder.cpp
+++ b/tests/auto/particles/qquicklineextruder/tst_qquicklineextruder.cpp
@@ -57,7 +57,7 @@ void tst_qquicklineextruder::test_basic()
     ensureAnimTime(600, system->m_animation);
 
     QVERIFY(extremelyFuzzyCompare(system->groupData[0]->size(), 500, 10));
-    foreach (QQuickParticleData *d, system->groupData[0]->data) {
+    for (QQuickParticleData *d : qAsConst(system->groupData[0]->data)) {
         if (d->t == -1)
             continue; //Particle data unused
 
@@ -73,7 +73,7 @@ void tst_qquicklineextruder::test_basic()
     }
 
     QCOMPARE(system->groupData[1]->size(), 500);
-    foreach (QQuickParticleData *d, system->groupData[1]->data) {
+    for (QQuickParticleData *d : qAsConst(system->groupData[1]->data)) {
         if (d->t == -1)
             continue; //Particle data unused
 
diff --git a/tests/auto/particles/qquickmaskextruder/tst_qquickmaskextruder.cpp b/tests/auto/particles/qquickmaskextruder/tst_qquickmaskextruder.cpp
index a3d0988019..d8481efc47 100644
--- a/tests/auto/particles/qquickmaskextruder/tst_qquickmaskextruder.cpp
+++ b/tests/auto/particles/qquickmaskextruder/tst_qquickmaskextruder.cpp
@@ -57,7 +57,7 @@ void tst_qquickmaskextruder::test_basic()
     ensureAnimTime(600, system->m_animation);
 
     QVERIFY(extremelyFuzzyCompare(system->groupData[0]->size(), 500, 10));
-    foreach (QQuickParticleData *d, system->groupData[0]->data) {
+    for (QQuickParticleData *d : qAsConst(system->groupData[0]->data)) {
         if (d->t == -1)
             continue; //Particle data unused
 
diff --git a/tests/auto/particles/qquickparticlegroup/tst_qquickparticlegroup.cpp b/tests/auto/particles/qquickparticlegroup/tst_qquickparticlegroup.cpp
index 8b7224623a..8791d19db6 100644
--- a/tests/auto/particles/qquickparticlegroup/tst_qquickparticlegroup.cpp
+++ b/tests/auto/particles/qquickparticlegroup/tst_qquickparticlegroup.cpp
@@ -58,7 +58,7 @@ void tst_qquickparticlegroup::test_instantTransition()
 
     //A frame or two worth of particles will be missed, the transition doesn't take effect on the frame it's spawned (QTBUG-21781)
     QVERIFY(system->groupData[0]->size() <= 500 && system->groupData[0]->size() >= 450);
-    foreach (QQuickParticleData *d, system->groupData[0]->data) {
+    for (QQuickParticleData *d : qAsConst(system->groupData[0]->data)) {
         if (d->t == -1)
             continue; //Particle data unused
 
diff --git a/tests/auto/particles/qquickparticlesystem/tst_qquickparticlesystem.cpp b/tests/auto/particles/qquickparticlesystem/tst_qquickparticlesystem.cpp
index 4a3c5cdc74..5c82b946e5 100644
--- a/tests/auto/particles/qquickparticlesystem/tst_qquickparticlesystem.cpp
+++ b/tests/auto/particles/qquickparticlesystem/tst_qquickparticlesystem.cpp
@@ -58,7 +58,7 @@ void tst_qquickparticlesystem::test_basic()
 
     QVERIFY(extremelyFuzzyCompare(system->groupData[0]->size(), 500, 10));
     int stillAlive = 0;
-    foreach (QQuickParticleData *d, system->groupData[0]->data) {
+    for (QQuickParticleData *d : qAsConst(system->groupData[0]->data)) {
         if (d->t == -1)
             continue; //Particle data unused
 
diff --git a/tests/auto/particles/qquickpointattractor/tst_qquickpointattractor.cpp b/tests/auto/particles/qquickpointattractor/tst_qquickpointattractor.cpp
index 99a8530d3a..c0d7d38512 100644
--- a/tests/auto/particles/qquickpointattractor/tst_qquickpointattractor.cpp
+++ b/tests/auto/particles/qquickpointattractor/tst_qquickpointattractor.cpp
@@ -57,7 +57,7 @@ void tst_qquickpointattractor::test_basic()
     ensureAnimTime(600, system->m_animation);
 
     QVERIFY(extremelyFuzzyCompare(system->groupData[0]->size(), 500, 10));
-    foreach (QQuickParticleData *d, system->groupData[0]->data) {
+    for (QQuickParticleData *d : qAsConst(system->groupData[0]->data)) {
         if (d->t == -1)
             continue; //Particle data unused
 
diff --git a/tests/auto/particles/qquickpointdirection/tst_qquickpointdirection.cpp b/tests/auto/particles/qquickpointdirection/tst_qquickpointdirection.cpp
index 0d150fb86d..5cc23e0306 100644
--- a/tests/auto/particles/qquickpointdirection/tst_qquickpointdirection.cpp
+++ b/tests/auto/particles/qquickpointdirection/tst_qquickpointdirection.cpp
@@ -57,7 +57,7 @@ void tst_qquickpointdirection::test_basic()
     ensureAnimTime(600, system->m_animation);
 
     QVERIFY(extremelyFuzzyCompare(system->groupData[0]->size(), 500, 10));
-    foreach (QQuickParticleData *d, system->groupData[0]->data) {
+    for (QQuickParticleData *d : qAsConst(system->groupData[0]->data)) {
         if (d->t == -1)
             continue; //Particle data unused
 
diff --git a/tests/auto/particles/qquickrectangleextruder/tst_qquickrectangleextruder.cpp b/tests/auto/particles/qquickrectangleextruder/tst_qquickrectangleextruder.cpp
index 24b30bf9ab..414e2d36f7 100644
--- a/tests/auto/particles/qquickrectangleextruder/tst_qquickrectangleextruder.cpp
+++ b/tests/auto/particles/qquickrectangleextruder/tst_qquickrectangleextruder.cpp
@@ -57,7 +57,7 @@ void tst_qquickrectangleextruder::test_basic()
     ensureAnimTime(600, system->m_animation);
 
     QVERIFY(extremelyFuzzyCompare(system->groupData[0]->size(), 500, 10));
-    foreach (QQuickParticleData *d, system->groupData[0]->data) {
+    for (QQuickParticleData *d : qAsConst(system->groupData[0]->data)) {
         if (d->t == -1)
             continue; //Particle data unused
 
@@ -76,7 +76,7 @@ void tst_qquickrectangleextruder::test_basic()
     }
 
     QCOMPARE(system->groupData[1]->size(), 500);
-    foreach (QQuickParticleData *d, system->groupData[1]->data) {
+    for (QQuickParticleData *d : qAsConst(system->groupData[1]->data)) {
         if (d->t == -1)
             continue; //Particle data unused
 
diff --git a/tests/auto/particles/qquickspritegoal/tst_qquickspritegoal.cpp b/tests/auto/particles/qquickspritegoal/tst_qquickspritegoal.cpp
index 8249159e43..ca5d9171f9 100644
--- a/tests/auto/particles/qquickspritegoal/tst_qquickspritegoal.cpp
+++ b/tests/auto/particles/qquickspritegoal/tst_qquickspritegoal.cpp
@@ -57,7 +57,7 @@ void tst_qquickspritegoal::test_instantTransition()
     ensureAnimTime(600, system->m_animation);
 
     QVERIFY(system->groupData[0]->size() <= 500 && system->groupData[0]->size() >= 450);
-    foreach (QQuickParticleData *d, system->groupData[0]->data) {
+    for (QQuickParticleData *d : qAsConst(system->groupData[0]->data)) {
         if (d->t == -1)
             continue; //Particle data unused
 
diff --git a/tests/auto/particles/qquicktargetdirection/tst_qquicktargetdirection.cpp b/tests/auto/particles/qquicktargetdirection/tst_qquicktargetdirection.cpp
index 8d9556fdac..2f45263c37 100644
--- a/tests/auto/particles/qquicktargetdirection/tst_qquicktargetdirection.cpp
+++ b/tests/auto/particles/qquicktargetdirection/tst_qquicktargetdirection.cpp
@@ -57,7 +57,7 @@ void tst_qquicktargetdirection::test_basic()
     ensureAnimTime(600, system->m_animation);
 
     QVERIFY(extremelyFuzzyCompare(system->groupData[0]->size(), 500, 10));
-    foreach (QQuickParticleData *d, system->groupData[0]->data) {
+    for (QQuickParticleData *d : qAsConst(system->groupData[0]->data)) {
         if (d->t == -1)
             continue; //Particle data unused
 
diff --git a/tests/auto/particles/qquicktrailemitter/tst_qquicktrailemitter.cpp b/tests/auto/particles/qquicktrailemitter/tst_qquicktrailemitter.cpp
index 99ecd7a06a..27d9bf01c9 100644
--- a/tests/auto/particles/qquicktrailemitter/tst_qquicktrailemitter.cpp
+++ b/tests/auto/particles/qquicktrailemitter/tst_qquicktrailemitter.cpp
@@ -57,7 +57,7 @@ void tst_qquicktrailemitter::test_basic()
     ensureAnimTime(600, system->m_animation);
 
     QVERIFY(extremelyFuzzyCompare(system->groupData[0]->size(), 500, 10));
-    foreach (QQuickParticleData *d, system->groupData[0]->data) {
+    for (QQuickParticleData *d : qAsConst(system->groupData[0]->data)) {
         if (d->t == -1)
             continue; //Particle data unused
 
@@ -74,7 +74,7 @@ void tst_qquicktrailemitter::test_basic()
     }
 
     QVERIFY(extremelyFuzzyCompare(system->groupData[1]->size(), 500, 10));
-    foreach (QQuickParticleData *d, system->groupData[1]->data) {
+    for (QQuickParticleData *d : qAsConst(system->groupData[1]->data)) {
         if (d->t == -1)
             continue; //Particle data unused
 
diff --git a/tests/auto/particles/qquickturbulence/tst_qquickturbulence.cpp b/tests/auto/particles/qquickturbulence/tst_qquickturbulence.cpp
index c8024470e4..74fafdc1d2 100644
--- a/tests/auto/particles/qquickturbulence/tst_qquickturbulence.cpp
+++ b/tests/auto/particles/qquickturbulence/tst_qquickturbulence.cpp
@@ -59,7 +59,7 @@ void tst_qquickturbulence::test_basic()
     //Note that the noise image built-in provides the 'randomness', so this test should be stable so long as it and the size
     //of the Turbulence item remain the same
     QVERIFY(extremelyFuzzyCompare(system->groupData[0]->size(), 500, 10));
-    foreach (QQuickParticleData *d, system->groupData[0]->data) {
+    for (QQuickParticleData *d : qAsConst(system->groupData[0]->data)) {
         if (d->t == -1)
             continue; //Particle data unused
 
diff --git a/tests/auto/particles/qquickwander/tst_qquickwander.cpp b/tests/auto/particles/qquickwander/tst_qquickwander.cpp
index 6e37fc648c..51ef7a272e 100644
--- a/tests/auto/particles/qquickwander/tst_qquickwander.cpp
+++ b/tests/auto/particles/qquickwander/tst_qquickwander.cpp
@@ -61,7 +61,7 @@ void tst_qquickwander::test_basic()
     //the 500 was randomly changed from 0.0 in velocity
     bool vxChanged = false;
     bool vyChanged = false;
-    foreach (QQuickParticleData *d, system->groupData[0]->data) {
+    for (QQuickParticleData *d : qAsConst(system->groupData[0]->data)) {
         if (d->t == -1)
             continue; //Particle data unused
 
diff --git a/tests/auto/qml/debugger/debugger.pro b/tests/auto/qml/debugger/debugger.pro
index ccb2d71c53..a50411e18b 100644
--- a/tests/auto/qml/debugger/debugger.pro
+++ b/tests/auto/qml/debugger/debugger.pro
@@ -20,6 +20,6 @@ PRIVATETESTS += \
 
 SUBDIRS += $$PUBLICTESTS
 
-contains(QT_CONFIG, private_tests) {
+qtConfig(private_tests): \
     SUBDIRS += $$PRIVATETESTS
-}
+
diff --git a/tests/auto/qml/qml.pro b/tests/auto/qml/qml.pro
index a1daa7a0c4..68a2eace19 100644
--- a/tests/auto/qml/qml.pro
+++ b/tests/auto/qml/qml.pro
@@ -8,7 +8,6 @@ PUBLICTESTS += \
     qjsvalueiterator \
     qjsonbinding \
     qmlmin \
-    qmlplugindump \
     qqmlcomponent \
     qqmlconsole \
     qqmlengine \
@@ -74,14 +73,13 @@ qtHaveModule(widgets) {
 SUBDIRS += $$PUBLICTESTS \
     qqmlextensionplugin
 SUBDIRS += $$METATYPETESTS
-!winrt { # no QProcess on winrt
+!uikit:!winrt { # no QProcess on uikit/winrt
     !contains(QT_CONFIG, no-qml-debug): SUBDIRS += debugger
-    SUBDIRS += qmllint
+    SUBDIRS += qmllint qmlplugindump
 }
 
-contains(QT_CONFIG, private_tests) {
+qtConfig(private_tests): \
     SUBDIRS += $$PRIVATETESTS
-}
 
 qtNomakeTools( \
     qmlplugindump \
diff --git a/tests/auto/qml/qqmlcontext/tst_qqmlcontext.cpp b/tests/auto/qml/qqmlcontext/tst_qqmlcontext.cpp
index e0cde6c86f..f49fd391ac 100644
--- a/tests/auto/qml/qqmlcontext/tst_qqmlcontext.cpp
+++ b/tests/auto/qml/qqmlcontext/tst_qqmlcontext.cpp
@@ -61,6 +61,7 @@ private slots:
     void qtbug_22535();
     void evalAfterInvalidate();
     void qobjectDerived();
+    void qtbug_49232();
 
 private:
     QQmlEngine engine;
@@ -200,6 +201,8 @@ class TestObject : public QObject
     Q_PROPERTY(int a READ a NOTIFY aChanged)
     Q_PROPERTY(int b READ b NOTIFY bChanged)
     Q_PROPERTY(int c READ c NOTIFY cChanged)
+    Q_PROPERTY(char d READ d NOTIFY dChanged)
+    Q_PROPERTY(uchar e READ e NOTIFY eChanged)
 
 public:
     TestObject() : _a(10), _b(10), _c(10) {}
@@ -213,15 +216,25 @@ public:
     int c() const { return _c; }
     void setC(int c) { _c = c; emit cChanged(); }
 
+    char d() const { return _d; }
+    void setD(char d) { _d = d; emit dChanged(); }
+
+    uchar e() const { return _e; }
+    void setE(uchar e) { _e = e; emit eChanged(); }
+
 signals:
     void aChanged();
     void bChanged();
     void cChanged();
+    void dChanged();
+    void eChanged();
 
 private:
     int _a;
     int _b;
     int _c;
+    char _d;
+    uchar _e;
 };
 
 #define TEST_CONTEXT_PROPERTY(ctxt, name, value) \
@@ -694,6 +707,22 @@ void tst_qqmlcontext::qobjectDerived()
     QCOMPARE(command.count, 2);
 }
 
+void tst_qqmlcontext::qtbug_49232()
+{
+    TestObject testObject;
+    testObject.setD('a');
+    testObject.setE(97);
+
+    QQmlEngine engine;
+    engine.rootContext()->setContextProperty("TestObject", &testObject);
+    QQmlComponent component(&engine);
+    component.setData("import QtQuick 2.0; QtObject { property int valueOne: TestObject.d; property int valueTwo: TestObject.e }", QUrl());
+    QScopedPointer<QObject> obj(component.create());
+
+    QCOMPARE(obj->property("valueOne"), QVariant('a'));
+    QCOMPARE(obj->property("valueTwo"), QVariant(97));
+}
+
 QTEST_MAIN(tst_qqmlcontext)
 
 #include "tst_qqmlcontext.moc"
diff --git a/tests/auto/qml/qqmlecmascript/data/DestructionHelper.qml b/tests/auto/qml/qqmlecmascript/data/DestructionHelper.qml
new file mode 100644
index 0000000000..8bb0a3554e
--- /dev/null
+++ b/tests/auto/qml/qqmlecmascript/data/DestructionHelper.qml
@@ -0,0 +1,3 @@
+import Test 1.0
+WeakReferenceMutator {
+}
diff --git a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
index 30ecfa7d96..a5373ccbcd 100644
--- a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
+++ b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
@@ -44,6 +44,8 @@
 #include <private/qv4scopedvalue_p.h>
 #include <private/qv4alloca_p.h>
 #include <private/qv4runtime_p.h>
+#include <private/qv4object_p.h>
+#include <private/qqmlcomponentattached_p.h>
 
 #ifdef Q_CC_MSVC
 #define NO_INLINE __declspec(noinline)
@@ -283,6 +285,7 @@ private slots:
     void replaceBinding();
     void deleteRootObjectInCreation();
     void onDestruction();
+    void onDestructionViaGC();
     void bindingSuppression();
     void signalEmitted();
     void threadSignal();
@@ -7200,6 +7203,105 @@ void tst_qqmlecmascript::onDestruction()
     }
 }
 
+class WeakReferenceMutator : public QObject
+{
+    Q_OBJECT
+public:
+    WeakReferenceMutator()
+        : resultPtr(Q_NULLPTR)
+        , weakRef(Q_NULLPTR)
+    {}
+
+    void init(QV4::ExecutionEngine *v4, QV4::WeakValue *weakRef, bool *resultPtr)
+    {
+        QV4::QObjectWrapper::wrap(v4, this);
+        QQmlEngine::setObjectOwnership(this, QQmlEngine::JavaScriptOwnership);
+
+        this->resultPtr = resultPtr;
+        this->weakRef = weakRef;
+
+        QObject::connect(QQmlComponent::qmlAttachedProperties(this), &QQmlComponentAttached::destruction, this, &WeakReferenceMutator::reviveFirstWeakReference);
+    }
+
+private slots:
+    void reviveFirstWeakReference() {
+        *resultPtr = weakRef->valueRef() && weakRef->isNullOrUndefined();
+        if (!*resultPtr)
+            return;
+        QV4::ExecutionEngine *v4 = QV8Engine::getV4(qmlEngine(this));
+        weakRef->set(v4, v4->newObject());
+        *resultPtr = weakRef->valueRef() && !weakRef->isNullOrUndefined();
+    }
+
+public:
+    bool *resultPtr;
+
+    QV4::WeakValue *weakRef;
+};
+
+QT_BEGIN_NAMESPACE
+
+namespace QV4 {
+
+namespace Heap {
+struct WeakReferenceSentinel : public Object {
+    WeakReferenceSentinel(WeakValue *weakRef, bool *resultPtr)
+        : weakRef(weakRef)
+        , resultPtr(resultPtr) {
+
+    }
+
+    ~WeakReferenceSentinel() {
+        *resultPtr = weakRef->isNullOrUndefined();
+    }
+
+    WeakValue *weakRef;
+    bool *resultPtr;
+};
+} // namespace Heap
+
+struct WeakReferenceSentinel : public Object {
+    V4_OBJECT2(WeakReferenceSentinel, Object)
+    V4_NEEDS_DESTROY
+};
+
+} // namespace QV4
+
+QT_END_NAMESPACE
+
+DEFINE_OBJECT_VTABLE(QV4::WeakReferenceSentinel);
+
+void tst_qqmlecmascript::onDestructionViaGC()
+{
+    qmlRegisterType<WeakReferenceMutator>("Test", 1, 0, "WeakReferenceMutator");
+
+    QQmlEngine engine;
+    QV4::ExecutionEngine *v4 = QV8Engine::getV4(&engine);
+
+    QQmlComponent component(&engine, testFileUrl("DestructionHelper.qml"));
+
+    QScopedPointer<QV4::WeakValue> weakRef;
+
+    bool mutatorResult = false;
+    bool sentinelResult = false;
+
+    {
+        weakRef.reset(new QV4::WeakValue);
+        weakRef->set(v4, v4->newObject());
+        QVERIFY(!weakRef->isNullOrUndefined());
+
+        QPointer<WeakReferenceMutator> weakReferenceMutator = qobject_cast<WeakReferenceMutator *>(component.create());
+        QVERIFY2(!weakReferenceMutator.isNull(), qPrintable(component.errorString()));
+        weakReferenceMutator->init(v4, weakRef.data(), &mutatorResult);
+
+        v4->memoryManager->allocObject<QV4::WeakReferenceSentinel>(weakRef.data(), &sentinelResult);
+    }
+    gc(engine);
+
+    QVERIFY2(mutatorResult, "We failed to re-assign the weak reference a new value during GC");
+    QVERIFY2(sentinelResult, "The weak reference was not cleared properly");
+}
+
 struct EventProcessor : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/qml/qqmlproperty/tst_qqmlproperty.cpp b/tests/auto/qml/qqmlproperty/tst_qqmlproperty.cpp
index 21e6d9efe6..fe73610bcc 100644
--- a/tests/auto/qml/qqmlproperty/tst_qqmlproperty.cpp
+++ b/tests/auto/qml/qqmlproperty/tst_qqmlproperty.cpp
@@ -327,11 +327,8 @@ class PropertyObject : public QObject
     Q_PROPERTY(MyQmlObject *qmlObject READ qmlObject)
     Q_PROPERTY(MyQObject *qObject READ qObject WRITE setQObject NOTIFY qObjectChanged)
     Q_PROPERTY(QString stringProperty READ stringProperty WRITE setStringProperty)
-    Q_PROPERTY(char charProperty READ charProperty WRITE setCharProperty)
     Q_PROPERTY(QChar qcharProperty READ qcharProperty WRITE setQcharProperty)
     Q_PROPERTY(QChar constQChar READ constQChar STORED false CONSTANT FINAL)
-    Q_PROPERTY(char constChar READ constChar STORED false CONSTANT FINAL)
-    Q_PROPERTY(int constInt READ constInt STORED false CONSTANT FINAL)
 
     Q_CLASSINFO("DefaultProperty", "defaultProperty")
 public:
@@ -368,15 +365,11 @@ public:
     }
 
     QString stringProperty() const { return m_stringProperty;}
-    char charProperty() const { return m_charProperty; }
     QChar qcharProperty() const { return m_qcharProperty; }
 
     QChar constQChar() const { return 0x25cf; /* Unicode: black circle */ }
-    char constChar() const { return 'A'; }
-    int constInt() const { return 123456; }
 
     void setStringProperty(QString arg) { m_stringProperty = arg; }
-    void setCharProperty(char arg) { m_charProperty = arg; }
     void setQcharProperty(QChar arg) { m_qcharProperty = arg; }
 
 signals:
@@ -393,7 +386,6 @@ private:
     MyQmlObject m_qmlObject;
     MyQObject *m_qObject;
     QString m_stringProperty;
-    char m_charProperty;
     QChar m_qcharProperty;
 };
 
@@ -1418,23 +1410,14 @@ void tst_qqmlproperty::write()
     // Char/string-property
     {
         PropertyObject o;
-        QQmlProperty charProperty(&o, "charProperty");
         QQmlProperty qcharProperty(&o, "qcharProperty");
         QQmlProperty stringProperty(&o, "stringProperty");
 
         const int black_circle = 0x25cf;
 
-        QCOMPARE(charProperty.write(QString("foo")), false);
-        QCOMPARE(charProperty.write('Q'), true);
-        QCOMPARE(charProperty.read(), QVariant('Q'));
-        QCOMPARE(charProperty.write(QString("t")), true);
-        QCOMPARE(charProperty.read(), QVariant('t'));
-
         QCOMPARE(qcharProperty.write(QString("foo")), false);
         QCOMPARE(qcharProperty.write('Q'), true);
         QCOMPARE(qcharProperty.read(), QVariant('Q'));
-        QCOMPARE(qcharProperty.write(QString("t")), true);
-        QCOMPARE(qcharProperty.read(), QVariant('t'));
         QCOMPARE(qcharProperty.write(QChar(black_circle)), true);
         QCOMPARE(qcharProperty.read(), QVariant(QChar(black_circle)));
 
@@ -1443,19 +1426,10 @@ void tst_qqmlproperty::write()
         QCOMPARE(o.stringProperty(), QString("bar"));
         QCOMPARE(stringProperty.write(QVariant(1234)), true);
         QCOMPARE(stringProperty.read().toString(), QString::number(1234));
+        QCOMPARE(stringProperty.write('A'), true);
+        QCOMPARE(stringProperty.read().toString(), QString::number('A'));
         QCOMPARE(stringProperty.write(QChar(black_circle)), true);
-        QCOMPARE(stringProperty.read(), QVariant(QString(QChar(black_circle))));
-
-        { // char -> QString
-            QQmlComponent component(&engine);
-            component.setData("import Test 1.0\nPropertyObject { stringProperty: constChar }", QUrl());
-            PropertyObject *obj = qobject_cast<PropertyObject*>(component.create());
-            QVERIFY(obj != 0);
-            if (obj) {
-                QQmlProperty stringProperty(obj, "stringProperty");
-                QCOMPARE(stringProperty.read(), QVariant(QString(obj->constChar())));
-            }
-        }
+        QCOMPARE(stringProperty.read(), QVariant(QChar(black_circle)));
 
         { // QChar -> QString
             QQmlComponent component(&engine);
@@ -1468,16 +1442,6 @@ void tst_qqmlproperty::write()
             }
         }
 
-        { // int -> QString
-            QQmlComponent component(&engine);
-            component.setData("import Test 1.0\nPropertyObject { stringProperty: constInt }", QUrl());
-            PropertyObject *obj = qobject_cast<PropertyObject*>(component.create());
-            QVERIFY(obj != 0);
-            if (obj) {
-                QQmlProperty stringProperty(obj, "stringProperty");
-                QCOMPARE(stringProperty.read(), QVariant(QString::number(obj->constInt())));
-            }
-        }
     }
 
     // VariantMap-property
diff --git a/tests/auto/qmldevtools/compile/compile.pro b/tests/auto/qmldevtools/compile/compile.pro
index 54430eb668..832700698f 100644
--- a/tests/auto/qmldevtools/compile/compile.pro
+++ b/tests/auto/qmldevtools/compile/compile.pro
@@ -5,7 +5,7 @@ force_bootstrap {
     !build_pass: CONFIG += release
 } else {
     QT = core
-    !build_pass:contains(QT_CONFIG, debug_and_release): CONFIG += release
+    !build_pass:qtConfig(debug_and_release): CONFIG += release
 }
 QT += qmldevtools-private
 macx:CONFIG -= app_bundle
diff --git a/tests/auto/qmldevtools/qmldevtools.pro b/tests/auto/qmldevtools/qmldevtools.pro
index a0ca1bff87..a9352d4df3 100644
--- a/tests/auto/qmldevtools/qmldevtools.pro
+++ b/tests/auto/qmldevtools/qmldevtools.pro
@@ -1,6 +1,4 @@
 TEMPLATE = subdirs
 
-contains(QT_CONFIG, private_tests) {
-    SUBDIRS += \
-        compile
-}
+qtConfig(private_tests): \
+    SUBDIRS += compile
diff --git a/tests/auto/qmltest/listview/tst_listview.qml b/tests/auto/qmltest/listview/tst_listview.qml
index 98d7ea4cb7..65f736f305 100644
--- a/tests/auto/qmltest/listview/tst_listview.qml
+++ b/tests/auto/qmltest/listview/tst_listview.qml
@@ -320,9 +320,13 @@ Item {
 
         function test_listInteractiveCurrentIndexEnforce() {
             mousePress(listInteractiveCurrentIndexEnforce, 10, 50);
+            wait(1); // because Flickable pays attention to velocity, we need some time between movements
             mouseMove(listInteractiveCurrentIndexEnforce, 10, 40);
+            wait(1);
             mouseMove(listInteractiveCurrentIndexEnforce, 10, 30);
+            wait(1);
             mouseMove(listInteractiveCurrentIndexEnforce, 10, 20);
+            wait(1);
             mouseMove(listInteractiveCurrentIndexEnforce, 10, 10);
             compare(listInteractiveCurrentIndexEnforce.interactive, false);
             mouseRelease(listInteractiveCurrentIndexEnforce, 10, 10);
diff --git a/tests/auto/quick/qquickflickable/data/contentXY.qml b/tests/auto/quick/qquickflickable/data/contentXY.qml
new file mode 100644
index 0000000000..8215976949
--- /dev/null
+++ b/tests/auto/quick/qquickflickable/data/contentXY.qml
@@ -0,0 +1,6 @@
+import QtQuick 2.0
+
+Flickable {
+    width: 400; height: 400
+    contentWidth: 1e11; contentHeight: 1e11
+}
diff --git a/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp b/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp
index e1678b9acd..a03e3b8170 100644
--- a/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp
+++ b/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp
@@ -91,6 +91,7 @@ private slots:
     void cleanup();
     void contentSize();
     void ratios_smallContent();
+    void contentXYNotTruncatedToInt();
 
 private:
     void flickWithTouch(QQuickWindow *window, QTouchDevice *touchDevice, const QPoint &from, const QPoint &to);
@@ -1841,6 +1842,26 @@ void tst_qquickflickable::ratios_smallContent()
     QCOMPARE(obj->property("widthRatioIs").toDouble(), 1.);
 }
 
+// QTBUG-48018
+void tst_qquickflickable::contentXYNotTruncatedToInt()
+{
+    QScopedPointer<QQuickView> window(new QQuickView);
+    window->setSource(testFileUrl("contentXY.qml"));
+    QTRY_COMPARE(window->status(), QQuickView::Ready);
+    QQuickViewTestUtil::centerOnScreen(window.data());
+    QQuickViewTestUtil::moveMouseAway(window.data());
+    window->show();
+    QVERIFY(QTest::qWaitForWindowActive(window.data()));
+
+    QQuickFlickable *flickable = qobject_cast<QQuickFlickable*>(window->rootObject());
+    QVERIFY(flickable);
+
+    flickable->setContentX(1e10);
+    flick(window.data(), QPoint(200, 100), QPoint(100, 100), 50);
+
+    // make sure we are not clipped at 2^31
+    QVERIFY(flickable->contentX() > qreal(1e10));
+}
 
 QTEST_MAIN(tst_qquickflickable)
 
diff --git a/tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp b/tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp
index adf0d282c5..7baff93574 100644
--- a/tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp
+++ b/tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp
@@ -1079,17 +1079,17 @@ void tst_QQuickMouseArea::clickThrough()
     QVERIFY(QTest::qWaitForWindowExposed(window.data()));
     QVERIFY(window->rootObject() != 0);
 
+    // to avoid generating a double click.
+    const int doubleClickInterval = qApp->styleHints()->mouseDoubleClickInterval() + 10;
+
     QTest::mousePress(window.data(), Qt::LeftButton, 0, QPoint(100,100));
     QTest::mouseRelease(window.data(), Qt::LeftButton, 0, QPoint(100,100));
 
     QTRY_COMPARE(window->rootObject()->property("presses").toInt(), 0);
     QTRY_COMPARE(window->rootObject()->property("clicks").toInt(), 1);
 
-    // to avoid generating a double click.
-    int doubleClickInterval = qApp->styleHints()->mouseDoubleClickInterval() + 10;
-    QTest::qWait(doubleClickInterval);
-
-    QTest::mousePress(window.data(), Qt::LeftButton, 0, QPoint(100,100));
+    QCOMPARE(window->rootObject()->property("doubleClicks").toInt(), 0);
+    QTest::mousePress(window.data(), Qt::LeftButton, 0, QPoint(100,100), doubleClickInterval);
     QTest::qWait(1000);
     QTest::mouseRelease(window.data(), Qt::LeftButton, 0, QPoint(100,100));
 
@@ -1119,9 +1119,7 @@ void tst_QQuickMouseArea::clickThrough()
     QCOMPARE(window->rootObject()->property("presses").toInt(), 0);
     QCOMPARE(window->rootObject()->property("clicks").toInt(), 0);
 
-    QTest::qWait(doubleClickInterval); // to avoid generating a double click.
-
-    QTest::mousePress(window.data(), Qt::LeftButton, 0, QPoint(100,100));
+    QTest::mousePress(window.data(), Qt::LeftButton, 0, QPoint(100,100), doubleClickInterval);
     QTest::qWait(1000);
     QTest::mouseRelease(window.data(), Qt::LeftButton, 0, QPoint(100,100));
     QTest::qWait(100);
@@ -1140,15 +1138,13 @@ void tst_QQuickMouseArea::clickThrough()
 
     window->rootObject()->setProperty("letThrough", QVariant(true));
 
-    QTest::qWait(doubleClickInterval); // to avoid generating a double click.
-    QTest::mousePress(window.data(), Qt::LeftButton, 0, QPoint(100,100));
+    QTest::mousePress(window.data(), Qt::LeftButton, 0, QPoint(100,100), doubleClickInterval);
     QTest::mouseRelease(window.data(), Qt::LeftButton, 0, QPoint(100,100));
 
     QCOMPARE(window->rootObject()->property("presses").toInt(), 0);
     QTRY_COMPARE(window->rootObject()->property("clicks").toInt(), 1);
 
-    QTest::qWait(doubleClickInterval); // to avoid generating a double click.
-    QTest::mousePress(window.data(), Qt::LeftButton, 0, QPoint(100,100));
+    QTest::mousePress(window.data(), Qt::LeftButton, 0, QPoint(100,100), doubleClickInterval);
     QTest::qWait(1000);
     QTest::mouseRelease(window.data(), Qt::LeftButton, 0, QPoint(100,100));
     QTest::qWait(100);
@@ -1167,12 +1163,10 @@ void tst_QQuickMouseArea::clickThrough()
 
     window->rootObject()->setProperty("noPropagation", QVariant(true));
 
-    QTest::qWait(doubleClickInterval); // to avoid generating a double click.
-    QTest::mousePress(window.data(), Qt::LeftButton, 0, QPoint(100,100));
+    QTest::mousePress(window.data(), Qt::LeftButton, 0, QPoint(100,100), doubleClickInterval);
     QTest::mouseRelease(window.data(), Qt::LeftButton, 0, QPoint(100,100));
 
-    QTest::qWait(doubleClickInterval); // to avoid generating a double click.
-    QTest::mousePress(window.data(), Qt::LeftButton, 0, QPoint(100,100));
+    QTest::mousePress(window.data(), Qt::LeftButton, 0, QPoint(100,100), doubleClickInterval);
     QTest::qWait(1000);
     QTest::mouseRelease(window.data(), Qt::LeftButton, 0, QPoint(100,100));
     QTest::qWait(100);
@@ -1193,7 +1187,7 @@ void tst_QQuickMouseArea::clickThrough()
     QVERIFY(QTest::qWaitForWindowExposed(window.data()));
     QVERIFY(window->rootObject() != 0);
 
-    QTest::mousePress(window.data(), Qt::LeftButton, 0, QPoint(100,100));
+    QTest::mousePress(window.data(), Qt::LeftButton, 0, QPoint(100,100), doubleClickInterval);
     QTest::mouseRelease(window.data(), Qt::LeftButton, 0, QPoint(100,100));
 
     QCOMPARE(window->rootObject()->property("clicksEnabled").toInt(), 1);
@@ -1201,8 +1195,7 @@ void tst_QQuickMouseArea::clickThrough()
 
     window->rootObject()->setProperty("disableLower", QVariant(true));
 
-    QTest::qWait(doubleClickInterval); // to avoid generating a double click.
-    QTest::mousePress(window.data(), Qt::LeftButton, 0, QPoint(100,100));
+    QTest::mousePress(window.data(), Qt::LeftButton, 0, QPoint(100,100), doubleClickInterval);
     QTest::mouseRelease(window.data(), Qt::LeftButton, 0, QPoint(100,100));
 
     QCOMPARE(window->rootObject()->property("clicksEnabled").toInt(), 2);
diff --git a/tests/auto/quick/qquickpathview/data/qtbug37815.qml b/tests/auto/quick/qquickpathview/data/qtbug37815.qml
new file mode 100644
index 0000000000..3fd4daca63
--- /dev/null
+++ b/tests/auto/quick/qquickpathview/data/qtbug37815.qml
@@ -0,0 +1,77 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 Netris
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+
+Rectangle {
+    width: 600
+    height: 400
+    PathView {
+        objectName: "pathView"
+        model: 10
+        anchors.fill: parent
+        pathItemCount: 5
+        cacheItemCount: 5
+        highlightRangeMode: PathView.StrictlyEnforceRange
+        preferredHighlightBegin: 0.5
+        preferredHighlightEnd: 0.5
+
+        path: Path {
+            startX: 0
+            startY: 50
+            PathLine {
+                x: 600
+                y: 50
+            }
+        }
+
+        delegate: Component {
+            Text {
+                width: 50
+                height: 50
+                text: index
+                objectName: "delegate" + index
+                font.pixelSize: 24
+                color: PathView.isCurrentItem ? "green" : "black"
+            }
+        }
+    }
+}
+
diff --git a/tests/auto/quick/qquickpathview/data/qtbug53464.qml b/tests/auto/quick/qquickpathview/data/qtbug53464.qml
new file mode 100644
index 0000000000..d30d404e68
--- /dev/null
+++ b/tests/auto/quick/qquickpathview/data/qtbug53464.qml
@@ -0,0 +1,77 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 Netris
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+
+Rectangle {
+    width: 600
+    height: 400
+    PathView {
+        objectName: "pathView"
+        model: 10
+        anchors.fill: parent
+        pathItemCount: 5
+        highlightRangeMode: PathView.StrictlyEnforceRange
+        preferredHighlightBegin: 0.5
+        preferredHighlightEnd: 0.5
+        currentIndex: 8
+
+        path: Path {
+            startX: 0
+            startY: 50
+            PathLine {
+                x: 600
+                y: 50
+            }
+        }
+
+        delegate: Component {
+            Text {
+                width: 50
+                height: 50
+                text: index
+                objectName: "delegate" + index
+                font.pixelSize: 24
+                color: PathView.isCurrentItem ? "green" : "black"
+            }
+        }
+    }
+}
+
diff --git a/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp b/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp
index 6761313210..d013d190ec 100644
--- a/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp
+++ b/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp
@@ -135,7 +135,9 @@ private slots:
     void nestedinFlickable();
     void flickableDelegate();
     void jsArrayChange();
+    void qtbug37815();
     void qtbug42716();
+    void qtbug53464();
     void addCustomAttribute();
     void movementDirection_data();
     void movementDirection();
@@ -2330,6 +2332,31 @@ void tst_QQuickPathView::jsArrayChange()
     QCOMPARE(spy.count(), 1);
 }
 
+void tst_QQuickPathView::qtbug37815()
+{
+    QScopedPointer<QQuickView> window(createView());
+
+    window->setSource(testFileUrl("qtbug37815.qml"));
+    window->show();
+    window->requestActivate();
+    QVERIFY(QTest::qWaitForWindowActive(window.data()));
+
+    // cache items will be created async. Let's wait...
+    QTest::qWait(1000);
+
+    QQuickPathView *pathView = findItem<QQuickPathView>(window->rootObject(), "pathView");
+    QVERIFY(pathView != Q_NULLPTR);
+
+    const int pathItemCount = pathView->pathItemCount();
+    const int cacheItemCount = pathView->cacheItemCount();
+    int totalCount = 0;
+    foreach (QQuickItem *item, pathView->childItems()) {
+        if (item->objectName().startsWith(QLatin1String("delegate")))
+            ++totalCount;
+    }
+    QCOMPARE(pathItemCount + cacheItemCount, totalCount);
+}
+
 /* This bug was one where if you jump the list such that the sole missing item needed to be
  * added in the middle of the list, it would instead move an item somewhere else in the list
  * to the middle (messing it up very badly).
@@ -2378,6 +2405,29 @@ void tst_QQuickPathView::qtbug42716()
     QVERIFY(!itemMiss);
 }
 
+void tst_QQuickPathView::qtbug53464()
+{
+    QScopedPointer<QQuickView> window(createView());
+
+    window->setSource(testFileUrl("qtbug53464.qml"));
+    window->show();
+    window->requestActivate();
+    QVERIFY(QTest::qWaitForWindowActive(window.data()));
+
+    QQuickPathView *pathView = findItem<QQuickPathView>(window->rootObject(), "pathView");
+    QVERIFY(pathView != Q_NULLPTR);
+    const int currentIndex = pathView->currentIndex();
+    QCOMPARE(currentIndex, 8);
+
+    const int pathItemCount = pathView->pathItemCount();
+    int totalCount = 0;
+    foreach (QQuickItem *item, pathView->childItems()) {
+        if (item->objectName().startsWith(QLatin1String("delegate")))
+            ++totalCount;
+    }
+    QCOMPARE(pathItemCount, totalCount);
+}
+
 void tst_QQuickPathView::addCustomAttribute()
 {
     const QScopedPointer<QQuickView> window(createView());
diff --git a/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp b/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp
index 942eb67563..8dc3053d89 100644
--- a/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp
+++ b/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp
@@ -201,6 +201,8 @@ private slots:
     void implicitSize();
     void implicitSizeBinding_data();
     void implicitSizeBinding();
+    void implicitResize_data();
+    void implicitResize();
 
     void negativeDimensions();
 
@@ -6010,6 +6012,39 @@ void tst_qquicktextinput::implicitSizeBinding()
     QCOMPARE(textObject->height(), textObject->implicitHeight());
 }
 
+void tst_qquicktextinput::implicitResize_data()
+{
+    QTest::addColumn<int>("alignment");
+    QTest::newRow("left") << int(Qt::AlignLeft);
+    QTest::newRow("center") << int(Qt::AlignHCenter);
+    QTest::newRow("right") << int(Qt::AlignRight);
+}
+
+void tst_qquicktextinput::implicitResize()
+{
+    QFETCH(int, alignment);
+
+    QQmlComponent component(&engine);
+    component.setData("import QtQuick 2.0\nTextInput { }", QUrl::fromLocalFile(""));
+
+    QScopedPointer<QQuickTextInput> textInput(qobject_cast<QQuickTextInput *>(component.create()));
+    QVERIFY(!textInput.isNull());
+
+    QScopedPointer<QQuickTextInput> textField(qobject_cast<QQuickTextInput *>(component.create()));
+    QVERIFY(!textField.isNull());
+    QQuickTextInputPrivate::get(textField.data())->setImplicitResizeEnabled(false);
+
+    textInput->setWidth(200);
+    textField->setImplicitWidth(200);
+
+    textInput->setHAlign(QQuickTextInput::HAlignment(alignment));
+    textField->setHAlign(QQuickTextInput::HAlignment(alignment));
+
+    textInput->setText("Qt");
+    textField->setText("Qt");
+
+    QCOMPARE(textField->positionToRectangle(0), textInput->positionToRectangle(0));
+}
 
 void tst_qquicktextinput::negativeDimensions()
 {
diff --git a/tests/auto/quick/quick.pro b/tests/auto/quick/quick.pro
index 70e5b8ef6a..c7ba4de86c 100644
--- a/tests/auto/quick/quick.pro
+++ b/tests/auto/quick/quick.pro
@@ -4,7 +4,7 @@ PUBLICTESTS += \
     geometry \
     qquickpixmapcache
 
-contains(QT_CONFIG, opengl(es1|es2)?) {
+qtConfig(opengl(es1|es2)?) {
     PUBLICTESTS += \
         rendernode
     qtHaveModule(widgets): PUBLICTESTS += nodes
@@ -88,9 +88,9 @@ QUICKTESTS =  \
 
 SUBDIRS += $$PUBLICTESTS
 
-!contains(QT_CONFIG, accessibility):QUICKTESTS -= qquickaccessible
+!qtConfig(accessibility):QUICKTESTS -= qquickaccessible
 
-contains(QT_CONFIG, private_tests) {
+qtConfig(private_tests) {
     SUBDIRS += $$PRIVATETESTS
     SUBDIRS += $$QUICKTESTS
 }
diff --git a/tests/auto/quick/touchmouse/tst_touchmouse.cpp b/tests/auto/quick/touchmouse/tst_touchmouse.cpp
index 1ec24e35d5..baa4bcb21c 100644
--- a/tests/auto/quick/touchmouse/tst_touchmouse.cpp
+++ b/tests/auto/quick/touchmouse/tst_touchmouse.cpp
@@ -1373,8 +1373,8 @@ void tst_TouchMouse::hoverEnabled()
     // ------------------------- Touch click on mouseArea1
     QTest::touchEvent(window, device).press(0, p1, window);
 
-    QVERIFY(enterSpy1.count() == 1);
-    QVERIFY(enterSpy2.count() == 0);
+    QCOMPARE(enterSpy1.count(), 1);
+    QCOMPARE(enterSpy2.count(), 0);
     QVERIFY(mouseArea1->pressed());
     QVERIFY(mouseArea1->hovered());
     QVERIFY(!mouseArea2->hovered());
@@ -1385,33 +1385,36 @@ void tst_TouchMouse::hoverEnabled()
     QVERIFY(!mouseArea2->hovered());
 
     // ------------------------- Touch click on mouseArea2
+    if (QGuiApplication::platformName().compare(QLatin1String("xcb"), Qt::CaseInsensitive) == 0)
+        QSKIP("hover can be momentarily inconsistent on X11, depending on timing of flushFrameSynchronousEvents with touch and mouse movements (QTBUG-55350)");
+
     QTest::touchEvent(window, device).press(0, p2, window);
 
     QVERIFY(mouseArea1->hovered());
     QVERIFY(mouseArea2->hovered());
     QVERIFY(mouseArea2->pressed());
-    QVERIFY(enterSpy1.count() == 1);
-    QVERIFY(enterSpy2.count() == 1);
+    QCOMPARE(enterSpy1.count(), 1);
+    QCOMPARE(enterSpy2.count(), 1);
 
     QTest::touchEvent(window, device).release(0, p2, window);
 
     QVERIFY(clickSpy2.count() == 1);
     QVERIFY(mouseArea1->hovered());
     QVERIFY(!mouseArea2->hovered());
-    QVERIFY(exitSpy1.count() == 0);
-    QVERIFY(exitSpy2.count() == 1);
+    QCOMPARE(exitSpy1.count(), 0);
+    QCOMPARE(exitSpy2.count(), 1);
 
     // ------------------------- Another touch click on mouseArea1
     QTest::touchEvent(window, device).press(0, p1, window);
 
-    QVERIFY(enterSpy1.count() == 1);
-    QVERIFY(enterSpy2.count() == 1);
+    QCOMPARE(enterSpy1.count(), 1);
+    QCOMPARE(enterSpy2.count(), 1);
     QVERIFY(mouseArea1->pressed());
     QVERIFY(mouseArea1->hovered());
     QVERIFY(!mouseArea2->hovered());
 
     QTest::touchEvent(window, device).release(0, p1, window);
-    QVERIFY(clickSpy1.count() == 2);
+    QCOMPARE(clickSpy1.count(), 2);
     QVERIFY(mouseArea1->hovered());
     QVERIFY(!mouseArea1->pressed());
     QVERIFY(!mouseArea2->hovered());
diff --git a/tests/benchmarks/benchmarks.pro b/tests/benchmarks/benchmarks.pro
index bd071ecf5c..5e6bc65815 100644
--- a/tests/benchmarks/benchmarks.pro
+++ b/tests/benchmarks/benchmarks.pro
@@ -1,5 +1,5 @@
 TEMPLATE = subdirs
 SUBDIRS = qml script
-contains(QT_CONFIG, private_tests) {
-    contains(QT_CONFIG, opengl(es1|es2)?):SUBDIRS += particles
+qtConfig(private_tests) {
+    qtConfig(opengl(es1|es2)?):SUBDIRS += particles
 }
diff --git a/tests/benchmarks/particles/affectors/tst_affectors.cpp b/tests/benchmarks/particles/affectors/tst_affectors.cpp
index 475b8d28ec..99d175564b 100644
--- a/tests/benchmarks/particles/affectors/tst_affectors.cpp
+++ b/tests/benchmarks/particles/affectors/tst_affectors.cpp
@@ -86,7 +86,7 @@ void tst_affectors::test_basic()
 
     int stillAlive = 0;
     QVERIFY(extremelyFuzzyCompare(system->groupData[0]->size(), 1000, 10));//Small simulation variance is permissible.
-    foreach (QQuickParticleData *d, system->groupData[0]->data) {
+    for (QQuickParticleData *d : qAsConst(system->groupData[0]->data)) {
         if (d->t == -1)
             continue; //Particle data unused
 
@@ -126,7 +126,7 @@ void tst_affectors::test_filtered()
 
     int stillAlive = 0;
     QVERIFY(extremelyFuzzyCompare(system->groupData[1]->size(), 1000, 10));//Small simulation variance is permissible.
-    foreach (QQuickParticleData *d, system->groupData[1]->data) {
+    for (QQuickParticleData *d : qAsConst(system->groupData[1]->data)) {
         if (d->t == -1)
             continue; //Particle data unused
 
diff --git a/tests/benchmarks/particles/emission/tst_emission.cpp b/tests/benchmarks/particles/emission/tst_emission.cpp
index b107120a28..fe08305f68 100644
--- a/tests/benchmarks/particles/emission/tst_emission.cpp
+++ b/tests/benchmarks/particles/emission/tst_emission.cpp
@@ -79,7 +79,7 @@ void tst_emission::test_basic()
 
     int stillAlive = 0;
     QVERIFY(extremelyFuzzyCompare(system->groupData[0]->size(), 1000, 10));//Small simulation variance is permissible.
-    foreach (QQuickParticleData *d, system->groupData[0]->data) {
+    for (QQuickParticleData *d : qAsConst(system->groupData[0]->data)) {
         if (d->t == -1)
             continue; //Particle data unused
 
diff --git a/tests/benchmarks/qml/animation/tst_animation.cpp b/tests/benchmarks/qml/animation/tst_animation.cpp
index 4f693f9fa8..59f5a57f5c 100644
--- a/tests/benchmarks/qml/animation/tst_animation.cpp
+++ b/tests/benchmarks/qml/animation/tst_animation.cpp
@@ -107,8 +107,8 @@ void tst_animation::animationelements_data()
 {
     QTest::addColumn<QString>("type");
 
-    QSet<QString> types = QQmlMetaType::qmlTypeNames().toSet();
-    foreach (const QString &type, types) {
+    const QSet<QString> types = QQmlMetaType::qmlTypeNames().toSet();
+    for (const QString &type : types) {
         if (type.contains(QLatin1String("Animation")))
             QTest::newRow(type.toLatin1()) << type;
     }
diff --git a/tests/benchmarks/qml/creation/creation.pro b/tests/benchmarks/qml/creation/creation.pro
index bb4d2841fe..42faf729a0 100644
--- a/tests/benchmarks/qml/creation/creation.pro
+++ b/tests/benchmarks/qml/creation/creation.pro
@@ -1,7 +1,7 @@
 CONFIG += benchmark
 TEMPLATE = app
 TARGET = tst_creation
-QT += core-private gui-private qml-private quick-private widgets testlib
+QT += core-private gui-private qml-private quick-private testlib
 macx:CONFIG -= app_bundle
 
 SOURCES += tst_creation.cpp
diff --git a/tests/benchmarks/qml/creation/tst_creation.cpp b/tests/benchmarks/qml/creation/tst_creation.cpp
index ca5802a8e7..a1c09db158 100644
--- a/tests/benchmarks/qml/creation/tst_creation.cpp
+++ b/tests/benchmarks/qml/creation/tst_creation.cpp
@@ -31,8 +31,6 @@
 #include <QQmlComponent>
 #include <private/qqmlmetatype_p.h>
 #include <QDebug>
-#include <QGraphicsScene>
-#include <QGraphicsItem>
 #include <QQuickItem>
 #include <QQmlContext>
 #include <private/qobject_p.h>
@@ -47,7 +45,6 @@ private slots:
     void qobject_cpp();
     void qobject_qml();
     void qobject_qmltype();
-    void qobject_alloc();
 
     void qobject_10flat_qml();
     void qobject_10flat_cpp();
@@ -62,9 +59,6 @@ private slots:
     void itemtree_qml();
     void itemtree_scene_cpp();
 
-    void elements_data();
-    void elements();
-
     void itemtests_qml_data();
     void itemtests_qml();
 
@@ -210,35 +204,6 @@ void tst_creation::qobject_qmltype()
     }
 }
 
-struct QObjectFakeData {
-    char data[sizeof(QObjectPrivate)];
-};
-
-struct QObjectFake {
-    QObjectFake();
-    virtual ~QObjectFake();
-private:
-    QObjectFakeData *d;
-};
-
-QObjectFake::QObjectFake()
-{
-    d = new QObjectFakeData;
-}
-
-QObjectFake::~QObjectFake()
-{
-    delete d;
-}
-
-void tst_creation::qobject_alloc()
-{
-    QBENCHMARK {
-        QObjectFake *obj = new QObjectFake;
-        delete obj;
-    }
-}
-
 struct QQmlGraphics_Derived : public QObject
 {
     void setParent_noEvent(QObject *parent) {
@@ -333,28 +298,6 @@ void tst_creation::itemtree_scene_cpp()
     delete root;
 }
 
-void tst_creation::elements_data()
-{
-    QTest::addColumn<QString>("type");
-
-    QList<QString> types = QQmlMetaType::qmlTypeNames();
-    foreach (QString type, types)
-        QTest::newRow(type.toLatin1()) << type;
-}
-
-void tst_creation::elements()
-{
-    QFETCH(QString, type);
-    QQmlType *t = QQmlMetaType::qmlType(type, 2, 0);
-    if (!t || !t->isCreatable())
-        QSKIP("Non-creatable type");
-
-    QBENCHMARK {
-        QObject *obj = t->create();
-        delete obj;
-    }
-}
-
 void tst_creation::itemtests_qml_data()
 {
     QTest::addColumn<QString>("filepath");
diff --git a/tests/benchmarks/qml/librarymetrics_performance/tst_librarymetrics_performance.cpp b/tests/benchmarks/qml/librarymetrics_performance/tst_librarymetrics_performance.cpp
index 5513dcb9a7..d7c54703ad 100644
--- a/tests/benchmarks/qml/librarymetrics_performance/tst_librarymetrics_performance.cpp
+++ b/tests/benchmarks/qml/librarymetrics_performance/tst_librarymetrics_performance.cpp
@@ -36,9 +36,6 @@
 // for the standard set of elements, properties and expressions which
 // are provided in the QtDeclarative library (QtQml and QtQuick).
 
-#define AVERAGE_OVER_N 10
-#define IGNORE_N_OUTLIERS 2
-
 class ModuleApi : public QObject
 {
     Q_OBJECT
@@ -214,123 +211,37 @@ void tst_librarymetrics_performance::compilation()
         }
     }
 
-    QList<qint64> nResults;
-
-    // generate AVERAGE_OVER_N results
-    for (int i = 0; i < AVERAGE_OVER_N; ++i) {
+    QBENCHMARK {
         cleanState(&e);
-        {
-            QElapsedTimer et;
-            et.start();
-            QQmlComponent c(e, this);
-            c.loadUrl(qmlfile); // just compile.
-            qint64 etime = et.nsecsElapsed();
-            nResults.append(etime);
-        }
-    }
-
-    // sort the list
-    qSort(nResults);
-
-    // remove IGNORE_N_OUTLIERS*2 from ONLY the worst end (remove gc interference)
-    for (int i = 0; i < IGNORE_N_OUTLIERS; ++i) {
-        if (!nResults.isEmpty()) nResults.removeLast();
-        if (!nResults.isEmpty()) nResults.removeLast();
+        QQmlComponent c(e, this);
+        c.loadUrl(qmlfile); // just compile.
     }
-
-    // now generate an average
-    qint64 totaltime = 0;
-    if (nResults.size() == 0) nResults.append(9999);
-    for (int i = 0; i < nResults.size(); ++i)
-        totaltime += nResults.at(i);
-    double average = ((double)totaltime) / nResults.count();
-
-    // and return it as the result
-    QTest::setBenchmarkResult(average, QTest::WalltimeNanoseconds);
-    QTest::setBenchmarkResult(average, QTest::WalltimeNanoseconds); // twice to workaround bug in QTestLib
 }
 
 void tst_librarymetrics_performance::instantiation_cached()
 {
     QFETCH(QUrl, qmlfile);
-
     cleanState(&e);
-    QList<qint64> nResults;
 
-    // generate AVERAGE_OVER_N results
-    for (int i = 0; i < AVERAGE_OVER_N; ++i) {
-        QElapsedTimer et;
-        et.start();
+    QBENCHMARK {
         QQmlComponent c(e, this);
         c.loadUrl(qmlfile); // just compile.
         QObject *o = c.create();
-        qint64 etime = et.nsecsElapsed();
-        nResults.append(etime);
         delete o;
     }
-
-    // sort the list
-    qSort(nResults);
-
-    // remove IGNORE_N_OUTLIERS*2 from ONLY the worst end (remove gc interference)
-    for (int i = 0; i < IGNORE_N_OUTLIERS; ++i) {
-        if (!nResults.isEmpty()) nResults.removeLast();
-        if (!nResults.isEmpty()) nResults.removeLast();
-    }
-
-    // now generate an average
-    qint64 totaltime = 0;
-    if (nResults.size() == 0) nResults.append(9999);
-    for (int i = 0; i < nResults.size(); ++i)
-        totaltime += nResults.at(i);
-    double average = ((double)totaltime) / nResults.count();
-
-    // and return it as the result
-    QTest::setBenchmarkResult(average, QTest::WalltimeNanoseconds);
-    QTest::setBenchmarkResult(average, QTest::WalltimeNanoseconds); // twice to workaround bug in QTestLib
 }
 
 void tst_librarymetrics_performance::instantiation()
 {
     QFETCH(QUrl, qmlfile);
 
-    cleanState(&e);
-    QList<qint64> nResults;
-
-    // generate AVERAGE_OVER_N results
-    for (int i = 0; i < AVERAGE_OVER_N; ++i) {
+    QBENCHMARK {
         cleanState(&e);
-        {
-            QElapsedTimer et;
-            et.start();
-            QQmlComponent c(e, this);
-            c.loadUrl(qmlfile); // just compile.
-            QObject *o = c.create();
-            qint64 etime = et.nsecsElapsed();
-            nResults.append(etime);
-            delete o;
-        }
-    }
-
-    // sort the list
-    qSort(nResults);
-
-    // remove IGNORE_N_OUTLIERS*2 from ONLY the worst end (remove gc interference)
-    for (int i = 0; i < IGNORE_N_OUTLIERS; ++i) {
-        if (!nResults.isEmpty()) nResults.removeLast();
-        if (!nResults.isEmpty()) nResults.removeLast();
+        QQmlComponent c(e, this);
+        c.loadUrl(qmlfile); // just compile.
+        QObject *o = c.create();
+        delete o;
     }
-
-    // now generate an average
-    qint64 totaltime = 0;
-    if (nResults.size() == 0) nResults.append(9999);
-    for (int i = 0; i < nResults.size(); ++i)
-        totaltime += nResults.at(i);
-    double average = ((double)totaltime) / nResults.count();
-
-    // and return it as the result
-    QTest::setBenchmarkResult(average, QTest::WalltimeNanoseconds);
-    QTest::setBenchmarkResult(average, QTest::WalltimeNanoseconds); // twice to workaround bug in QTestLib
 }
 
 void tst_librarymetrics_performance::positioners_data()
@@ -351,43 +262,13 @@ void tst_librarymetrics_performance::positioners()
 {
     QFETCH(QUrl, qmlfile);
 
-    cleanState(&e);
-    QList<qint64> nResults;
-
-    // generate AVERAGE_OVER_N results
-    for (int i = 0; i < AVERAGE_OVER_N; ++i) {
+    QBENCHMARK {
         cleanState(&e);
-        {
-            QElapsedTimer et;
-            et.start();
-            QQmlComponent c(e, this);
-            c.loadUrl(qmlfile); // just compile.
-            QObject *o = c.create();
-            qint64 etime = et.nsecsElapsed();
-            nResults.append(etime);
-            delete o;
-        }
-    }
-
-    // sort the list
-    qSort(nResults);
-
-    // remove IGNORE_N_OUTLIERS*2 from ONLY the worst end (remove gc interference)
-    for (int i = 0; i < IGNORE_N_OUTLIERS; ++i) {
-        if (!nResults.isEmpty()) nResults.removeLast();
-        if (!nResults.isEmpty()) nResults.removeLast();
+        QQmlComponent c(e, this);
+        c.loadUrl(qmlfile); // just compile.
+        QObject *o = c.create();
+        delete o;
     }
-
-    // now generate an average
-    qint64 totaltime = 0;
-    if (nResults.size() == 0) nResults.append(9999);
-    for (int i = 0; i < nResults.size(); ++i)
-        totaltime += nResults.at(i);
-    double average = ((double)totaltime) / nResults.count();
-
-    // and return it as the result
-    QTest::setBenchmarkResult(average, QTest::WalltimeNanoseconds);
-    QTest::setBenchmarkResult(average, QTest::WalltimeNanoseconds); // twice to workaround bug in QTestLib
 }
 
 QTEST_MAIN(tst_librarymetrics_performance)
diff --git a/tests/benchmarks/qml/qml.pro b/tests/benchmarks/qml/qml.pro
index 5d48ec0067..2cf2dff413 100644
--- a/tests/benchmarks/qml/qml.pro
+++ b/tests/benchmarks/qml/qml.pro
@@ -7,13 +7,12 @@ SUBDIRS += \
            holistic \
            qqmlchangeset \
            qqmlcomponent \
-           qqmlimage \
            qqmlmetaproperty \
            librarymetrics_performance \
 #            script \ ### FIXME: doesn't build
-           js
+           js \
+           creation
 
 qtHaveModule(opengl): SUBDIRS += painting qquickwindow
-qtHaveModule(widgets): SUBDIRS += creation
 
 include(../trusted-benchmarks.pri)
diff --git a/tests/benchmarks/qml/qqmlimage/image.png b/tests/benchmarks/qml/qqmlimage/image.png
deleted file mode 100644
index 623d36233d..0000000000
--- a/tests/benchmarks/qml/qqmlimage/image.png
+++ /dev/null
diff --git a/tests/benchmarks/qml/qqmlimage/qqmlimage.pro b/tests/benchmarks/qml/qqmlimage/qqmlimage.pro
deleted file mode 100644
index 421f232a4f..0000000000
--- a/tests/benchmarks/qml/qqmlimage/qqmlimage.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-CONFIG += benchmark
-TEMPLATE = app
-TARGET = tst_qqmlimage
-QT += qml quick-private testlib
-macx:CONFIG -= app_bundle
-CONFIG += release
-
-SOURCES += tst_qqmlimage.cpp
-
-DEFINES += SRCDIR=\\\"$$PWD\\\"
-
diff --git a/tests/benchmarks/qml/qqmlimage/tst_qqmlimage.cpp b/tests/benchmarks/qml/qqmlimage/tst_qqmlimage.cpp
deleted file mode 100644
index 38fca802c5..0000000000
--- a/tests/benchmarks/qml/qqmlimage/tst_qqmlimage.cpp
+++ /dev/null
@@ -1,95 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <qtest.h>
-#include <QQmlEngine>
-#include <QQmlComponent>
-#include <private/qquickimage_p.h>
-
-class tst_qmlgraphicsimage : public QObject
-{
-    Q_OBJECT
-public:
-    tst_qmlgraphicsimage() {}
-
-private slots:
-    void qmlgraphicsimage();
-    void qmlgraphicsimage_file();
-    void qmlgraphicsimage_url();
-
-private:
-    QQmlEngine engine;
-};
-
-void tst_qmlgraphicsimage::qmlgraphicsimage()
-{
-    int x = 0;
-    QUrl url(SRCDIR "/image.png");
-    QBENCHMARK {
-        QUrl url2("http://localhost/image" + QString::number(x++) + ".png");
-        QQuickImage *image = new QQuickImage;
-        QQmlEngine::setContextForObject(image, engine.rootContext());
-        delete image;
-    }
-}
-
-void tst_qmlgraphicsimage::qmlgraphicsimage_file()
-{
-    int x = 0;
-    QUrl url(SRCDIR "/image.png");
-    //get rid of initialization effects
-    {
-        QQuickImage *image = new QQuickImage;
-        QQmlEngine::setContextForObject(image, engine.rootContext());
-        image->setSource(url);
-    }
-    QBENCHMARK {
-        QUrl url2("http://localhost/image" + QString::number(x++) + ".png");
-        QQuickImage *image = new QQuickImage;
-        QQmlEngine::setContextForObject(image, engine.rootContext());
-        image->setSource(url);
-        delete image;
-    }
-}
-
-void tst_qmlgraphicsimage::qmlgraphicsimage_url()
-{
-    int x = 0;
-    QUrl url(SRCDIR "/image.png");
-    QBENCHMARK {
-        QUrl url2("http://localhost/image" + QString::number(x++) + ".png");
-        QQuickImage *image = new QQuickImage;
-        QQmlEngine::setContextForObject(image, engine.rootContext());
-        image->setSource(url2);
-        delete image;
-    }
-}
-
-QTEST_MAIN(tst_qmlgraphicsimage)
-
-#include "tst_qqmlimage.moc"
diff --git a/tests/manual/qmlplugindump/tst_qmlplugindump.cpp b/tests/manual/qmlplugindump/tst_qmlplugindump.cpp
index ed00682a83..1bedd4427b 100644
--- a/tests/manual/qmlplugindump/tst_qmlplugindump.cpp
+++ b/tests/manual/qmlplugindump/tst_qmlplugindump.cpp
@@ -92,7 +92,7 @@ public:
     {
         QRegularExpression re;
         QRegularExpressionMatch m;
-        Q_FOREACH (const QString &e, m_expected) {
+        for (const QString &e : m_expected) {
             re.setPattern(e);
             m = re.match(QString::fromLatin1(buffer));
             if (!m.hasMatch()) {
@@ -187,7 +187,8 @@ Test createTest(const QString &id, const QJsonObject &def)
         return Test(id);
     }
     QStringList patterns;
-    Q_FOREACH (const QJsonValue &x, expected.toArray()) {
+    const auto expectedArray = expected.toArray();
+    for (const QJsonValue &x : expectedArray) {
         if (!x.isString()) {
             qWarning() << "Wrong definition for test: " << id << ".";
             return Test(id);
@@ -331,7 +332,7 @@ void tst_qmlplugindump::plugin_data()
     QTest::addColumn<QString>("version");
     QTest::addColumn<QStringList>("expected");
 
-    Q_FOREACH (const Test &t, tests) {
+    for (const Test &t : qAsConst(tests)) {
         if (t.isNull())
             QSKIP("Errors in test definition.");
         QTest::newRow(t.id.toLatin1().data()) << t.project << t.version << t.expected;
@@ -357,9 +358,9 @@ void tst_qmlplugindump::plugin()
 void tst_qmlplugindump::cleanupTestCase()
 {
     QSet<const QString> projects;
-    Q_FOREACH (const Test &t, tests)
+    for (const Test &t : qAsConst(tests))
         projects.insert(t.project);
-    Q_FOREACH (const QString &p, projects) {
+    for (const QString &p : qAsConst(projects)) {
         if (!cleanUpSample(p))
             qWarning() << "Error in cleaning up project" << p << ".";
     }
diff --git a/tests/manual/scenegraph_lancelot/scenegrabber/main.cpp b/tests/manual/scenegraph_lancelot/scenegrabber/main.cpp
index 5098d51134..886cfc6599 100644
--- a/tests/manual/scenegraph_lancelot/scenegrabber/main.cpp
+++ b/tests/manual/scenegraph_lancelot/scenegrabber/main.cpp
@@ -183,8 +183,8 @@ int main(int argc, char *argv[])
     v.setSource(QUrl::fromLocalFile(ifile));
 
     if (noText) {
-        QList<QQuickItem*> items = v.rootObject()->findChildren<QQuickItem*>();
-        foreach (QQuickItem *item, items) {
+        const QList<QQuickItem*> items = v.rootObject()->findChildren<QQuickItem*>();
+        for (QQuickItem *item : items) {
             if (QByteArray(item->metaObject()->className()).contains("Text"))
                 item->setVisible(false);
         }
diff --git a/tests/manual/scenegraph_lancelot/scenegraph/tst_scenegraph.cpp b/tests/manual/scenegraph_lancelot/scenegraph/tst_scenegraph.cpp
index 426e06ccc2..3f28d90e7b 100644
--- a/tests/manual/scenegraph_lancelot/scenegraph/tst_scenegraph.cpp
+++ b/tests/manual/scenegraph_lancelot/scenegraph/tst_scenegraph.cpp
@@ -156,7 +156,7 @@ void tst_Scenegraph::setupTestSuite(const QByteArray& filter)
     }
 
     std::sort(itemFiles.begin(), itemFiles.end());
-    foreach (const QString &filePath, itemFiles) {
+    for (const QString &filePath : qAsConst(itemFiles)) {
         QByteArray itemName = filePath.mid(testSuitePath.length() + 1).toLatin1();
         QBaselineTest::newRow(itemName, checksumFileOrDir(filePath)) << filePath;
         numItems++;
@@ -238,7 +238,9 @@ quint16 tst_Scenegraph::checksumFileOrDir(const QString &path)
     if (fi.isDir()) {
         static const QStringList nameFilters = QStringList() << "*.qml" << "*.cpp" << "*.png" << "*.jpg";
         quint16 cs = 0;
-        foreach (QString item, QDir(fi.filePath()).entryList(nameFilters, QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot))
+        const auto entryList = QDir(fi.filePath()).entryList(nameFilters,
+                                                             QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot);
+        for (const QString &item : entryList)
             cs ^= checksumFileOrDir(path + QLatin1Char('/') + item);
         return cs;
     }