tests/quick: Replace Q[TRY]_VERIFY(a == b) by Q[TRY]_COMPARE(a, b).

- Replace Q[TRY]_VERIFY(pointer == 0) by Q[TRY]_VERIFY(!pointer).
- Replace Q[TRY]_VERIFY(smartPointer == 0)  by
          Q[TRY]_VERIFY(smartPointer.isNull()).
- Replace Q[TRY]_VERIFY(a == b) by  Q[TRY]_COMPARE(a, b) and
  add casts where necessary. The values will then be logged
  should a test fail.

Change-Id: Ib9f4c2486af23c47990be4b9e004b965de226dcc
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>

39 files changed, 512 insertions, 512 deletions

diff --git a/tests/auto/particles/qquickpointattractor/tst_qquickpointattractor.cpp b/tests/auto/particles/qquickpointattractor/tst_qquickpointattractor.cpp
index 325702f9c4..8132f3e24b 100644
--- a/tests/auto/particles/qquickpointattractor/tst_qquickpointattractor.cpp
+++ b/tests/auto/particles/qquickpointattractor/tst_qquickpointattractor.cpp
@@ -68,7 +68,7 @@ void tst_qquickpointattractor::test_basic()
 
         QVERIFY(d->x != 0.f);
         QVERIFY(d->y != 0.f);
-        QVERIFY(d->x == d->y);
+        QCOMPARE(d->x, d->y);
         QCOMPARE(d->vx, 0.f);
         QCOMPARE(d->vy, 0.f);
         QCOMPARE(d->ax, 0.f);
diff --git a/tests/auto/quick/geometry/tst_geometry.cpp b/tests/auto/quick/geometry/tst_geometry.cpp
index 1cc9b112cc..bdd6f1a394 100644
--- a/tests/auto/quick/geometry/tst_geometry.cpp
+++ b/tests/auto/quick/geometry/tst_geometry.cpp
@@ -58,7 +58,7 @@ void GeometryTest::testPoint2D()
     QCOMPARE(geometry.sizeOfVertex(), (int) sizeof(float) * 2);
     QCOMPARE(geometry.vertexCount(), 4);
     QCOMPARE(geometry.indexCount(), 0);
-    QVERIFY(geometry.indexData() == 0);
+    QVERIFY(!geometry.indexData());
 
     QSGGeometry::updateRectGeometry(&geometry, QRectF(1, 2, 3, 4));
 
@@ -91,7 +91,7 @@ void GeometryTest::testTexturedPoint2D()
     QCOMPARE(geometry.sizeOfVertex(), (int) sizeof(float) * 4);
     QCOMPARE(geometry.vertexCount(), 4);
     QCOMPARE(geometry.indexCount(), 0);
-    QVERIFY(geometry.indexData() == 0);
+    QVERIFY(!geometry.indexData());
 
     QSGGeometry::updateTexturedRectGeometry(&geometry, QRectF(1, 2, 3, 4), QRectF(5, 6, 7, 8));
 
@@ -163,7 +163,7 @@ void GeometryTest::testCustomGeometry()
     for (int i=0; i<4000; ++i)
         QCOMPARE(ii[i], (quint16) i);
     for (int i=0; i<1000; ++i)
-        QVERIFY(v[i].v1 == 6);
+        QCOMPARE(v[i].v1, float(6));
 
 }
 
diff --git a/tests/auto/quick/qquickanchors/tst_qquickanchors.cpp b/tests/auto/quick/qquickanchors/tst_qquickanchors.cpp
index 6591d84504..597ea87feb 100644
--- a/tests/auto/quick/qquickanchors/tst_qquickanchors.cpp
+++ b/tests/auto/quick/qquickanchors/tst_qquickanchors.cpp
@@ -405,15 +405,15 @@ void tst_qquickanchors::resetConvenience()
 
     //fill
     itemPrivate->anchors()->setFill(baseItem);
-    QVERIFY(itemPrivate->anchors()->fill() == baseItem);
+    QCOMPARE(itemPrivate->anchors()->fill(), baseItem);
     itemPrivate->anchors()->resetFill();
-    QVERIFY(itemPrivate->anchors()->fill() == 0);
+    QVERIFY(!itemPrivate->anchors()->fill());
 
     //centerIn
     itemPrivate->anchors()->setCenterIn(baseItem);
-    QVERIFY(itemPrivate->anchors()->centerIn() == baseItem);
+    QCOMPARE(itemPrivate->anchors()->centerIn(), baseItem);
     itemPrivate->anchors()->resetCenterIn();
-    QVERIFY(itemPrivate->anchors()->centerIn() == 0);
+    QVERIFY(!itemPrivate->anchors()->centerIn());
 
     delete item;
     delete baseItem;
diff --git a/tests/auto/quick/qquickanimatedimage/tst_qquickanimatedimage.cpp b/tests/auto/quick/qquickanimatedimage/tst_qquickanimatedimage.cpp
index a0accfcd58..45694f38dd 100644
--- a/tests/auto/quick/qquickanimatedimage/tst_qquickanimatedimage.cpp
+++ b/tests/auto/quick/qquickanimatedimage/tst_qquickanimatedimage.cpp
@@ -335,48 +335,48 @@ void tst_qquickanimatedimage::sourceSizeChanges()
     // Local
     ctxt->setContextProperty("srcImage", QUrl(""));
     QTRY_COMPARE(anim->status(), QQuickAnimatedImage::Null);
-    QTRY_VERIFY(sourceSizeSpy.count() == 0);
+    QTRY_COMPARE(sourceSizeSpy.count(), 0);
 
     ctxt->setContextProperty("srcImage", testFileUrl("hearts.gif"));
     QTRY_COMPARE(anim->status(), QQuickAnimatedImage::Ready);
-    QTRY_VERIFY(sourceSizeSpy.count() == 1);
+    QTRY_COMPARE(sourceSizeSpy.count(), 1);
 
     ctxt->setContextProperty("srcImage", testFileUrl("hearts.gif"));
     QTRY_COMPARE(anim->status(), QQuickAnimatedImage::Ready);
-    QTRY_VERIFY(sourceSizeSpy.count() == 1);
+    QTRY_COMPARE(sourceSizeSpy.count(), 1);
 
     ctxt->setContextProperty("srcImage", testFileUrl("hearts_copy.gif"));
     QTRY_COMPARE(anim->status(), QQuickAnimatedImage::Ready);
-    QTRY_VERIFY(sourceSizeSpy.count() == 1);
+    QTRY_COMPARE(sourceSizeSpy.count(), 1);
 
     ctxt->setContextProperty("srcImage", testFileUrl("colors.gif"));
     QTRY_COMPARE(anim->status(), QQuickAnimatedImage::Ready);
-    QTRY_VERIFY(sourceSizeSpy.count() == 2);
+    QTRY_COMPARE(sourceSizeSpy.count(), 2);
 
     ctxt->setContextProperty("srcImage", QUrl(""));
     QTRY_COMPARE(anim->status(), QQuickAnimatedImage::Null);
-    QTRY_VERIFY(sourceSizeSpy.count() == 3);
+    QTRY_COMPARE(sourceSizeSpy.count(), 3);
 
     // Remote
     ctxt->setContextProperty("srcImage", server.url("/hearts.gif"));
     QTRY_COMPARE(anim->status(), QQuickAnimatedImage::Ready);
-    QTRY_VERIFY(sourceSizeSpy.count() == 4);
+    QTRY_COMPARE(sourceSizeSpy.count(), 4);
 
     ctxt->setContextProperty("srcImage", server.url("/hearts.gif"));
     QTRY_COMPARE(anim->status(), QQuickAnimatedImage::Ready);
-    QTRY_VERIFY(sourceSizeSpy.count() == 4);
+    QTRY_COMPARE(sourceSizeSpy.count(), 4);
 
     ctxt->setContextProperty("srcImage", server.url("/hearts_copy.gif"));
     QTRY_COMPARE(anim->status(), QQuickAnimatedImage::Ready);
-    QTRY_VERIFY(sourceSizeSpy.count() == 4);
+    QTRY_COMPARE(sourceSizeSpy.count(), 4);
 
     ctxt->setContextProperty("srcImage", server.url("/colors.gif"));
     QTRY_COMPARE(anim->status(), QQuickAnimatedImage::Ready);
-    QTRY_VERIFY(sourceSizeSpy.count() == 5);
+    QTRY_COMPARE(sourceSizeSpy.count(), 5);
 
     ctxt->setContextProperty("srcImage", QUrl(""));
     QTRY_COMPARE(anim->status(), QQuickAnimatedImage::Null);
-    QTRY_VERIFY(sourceSizeSpy.count() == 6);
+    QTRY_COMPARE(sourceSizeSpy.count(), 6);
 
     delete anim;
 }
@@ -397,8 +397,8 @@ void tst_qquickanimatedimage::qtbug_16520()
     QVERIFY(anim != 0);
 
     anim->setProperty("source", server.urlString("/stickman.gif"));
-    QTRY_VERIFY(anim->opacity() == 0);
-    QTRY_VERIFY(anim->opacity() == 1);
+    QTRY_COMPARE(anim->opacity(), qreal(0));
+    QTRY_COMPARE(anim->opacity(), qreal(1));
 
     delete anim;
     delete root;
@@ -418,8 +418,8 @@ void tst_qquickanimatedimage::progressAndStatusChanges()
     component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
     QQuickImage *obj = qobject_cast<QQuickImage*>(component.create());
     QVERIFY(obj != 0);
-    QVERIFY(obj->status() == QQuickImage::Ready);
-    QTRY_VERIFY(obj->progress() == 1.0);
+    QCOMPARE(obj->status(), QQuickImage::Ready);
+    QTRY_COMPARE(obj->progress(), 1.0);
 
     qRegisterMetaType<QQuickImageBase::Status>();
     QSignalSpy sourceSpy(obj, SIGNAL(sourceChanged(QUrl)));
@@ -428,33 +428,33 @@ void tst_qquickanimatedimage::progressAndStatusChanges()
 
     // Same image
     ctxt->setContextProperty("srcImage", testFileUrl("stickman.gif"));
-    QTRY_VERIFY(obj->status() == QQuickImage::Ready);
-    QTRY_VERIFY(obj->progress() == 1.0);
+    QTRY_COMPARE(obj->status(), QQuickImage::Ready);
+    QTRY_COMPARE(obj->progress(), 1.0);
     QTRY_COMPARE(sourceSpy.count(), 0);
     QTRY_COMPARE(progressSpy.count(), 0);
     QTRY_COMPARE(statusSpy.count(), 0);
 
     // Loading local file
     ctxt->setContextProperty("srcImage", testFileUrl("colors.gif"));
-    QTRY_VERIFY(obj->status() == QQuickImage::Ready);
-    QTRY_VERIFY(obj->progress() == 1.0);
+    QTRY_COMPARE(obj->status(), QQuickImage::Ready);
+    QTRY_COMPARE(obj->progress(), 1.0);
     QTRY_COMPARE(sourceSpy.count(), 1);
     QTRY_COMPARE(progressSpy.count(), 0);
     QTRY_COMPARE(statusSpy.count(), 1);
 
     // Loading remote file
     ctxt->setContextProperty("srcImage", server.url("/stickman.gif"));
-    QTRY_VERIFY(obj->status() == QQuickImage::Loading);
-    QTRY_VERIFY(obj->progress() == 0.0);
-    QTRY_VERIFY(obj->status() == QQuickImage::Ready);
-    QTRY_VERIFY(obj->progress() == 1.0);
+    QTRY_COMPARE(obj->status(), QQuickImage::Loading);
+    QTRY_COMPARE(obj->progress(), 0.0);
+    QTRY_COMPARE(obj->status(), QQuickImage::Ready);
+    QTRY_COMPARE(obj->progress(), 1.0);
     QTRY_COMPARE(sourceSpy.count(), 2);
     QTRY_VERIFY(progressSpy.count() > 1);
     QTRY_COMPARE(statusSpy.count(), 3);
 
     ctxt->setContextProperty("srcImage", "");
-    QTRY_VERIFY(obj->status() == QQuickImage::Null);
-    QTRY_VERIFY(obj->progress() == 0.0);
+    QTRY_COMPARE(obj->status(), QQuickImage::Null);
+    QTRY_COMPARE(obj->progress(), 0.0);
     QTRY_COMPARE(sourceSpy.count(), 3);
     QTRY_VERIFY(progressSpy.count() > 2);
     QTRY_COMPARE(statusSpy.count(), 4);
@@ -472,7 +472,7 @@ void tst_qquickanimatedimage::playingAndPausedChanges()
     component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
     QQuickAnimatedImage *obj = qobject_cast<QQuickAnimatedImage*>(component.create());
     QVERIFY(obj != 0);
-    QVERIFY(obj->status() == QQuickAnimatedImage::Null);
+    QCOMPARE(obj->status(), QQuickAnimatedImage::Null);
     QTRY_VERIFY(obj->isPlaying());
     QTRY_VERIFY(!obj->isPaused());
     QSignalSpy playingSpy(obj, SIGNAL(playingChanged()));
diff --git a/tests/auto/quick/qquickanimations/tst_qquickanimations.cpp b/tests/auto/quick/qquickanimations/tst_qquickanimations.cpp
index 4aa8580f02..2b805e9eeb 100644
--- a/tests/auto/quick/qquickanimations/tst_qquickanimations.cpp
+++ b/tests/auto/quick/qquickanimations/tst_qquickanimations.cpp
@@ -122,9 +122,9 @@ void tst_qquickanimations::simpleProperty()
     animation.setTargetObject(&rect);
     animation.setProperty("x");
     animation.setTo(200);
-    QVERIFY(animation.target() == &rect);
-    QVERIFY(animation.property() == "x");
-    QVERIFY(animation.to().toReal() == 200.0);
+    QCOMPARE(animation.target(), &rect);
+    QCOMPARE(animation.property(), QLatin1String("x"));
+    QCOMPARE(animation.to().toReal(), 200.0);
     animation.start();
     QVERIFY(animation.isRunning());
     QTest::qWait(animation.duration());
@@ -136,7 +136,7 @@ void tst_qquickanimations::simpleProperty()
     animation.pause();
     QVERIFY(animation.isPaused());
     animation.setCurrentTime(125);
-    QVERIFY(animation.currentTime() == 125);
+    QCOMPARE(animation.currentTime(), 125);
     QCOMPARE(rect.x(),100.0);
 }
 
@@ -147,9 +147,9 @@ void tst_qquickanimations::simpleNumber()
     animation.setTargetObject(&rect);
     animation.setProperty("x");
     animation.setTo(200);
-    QVERIFY(animation.target() == &rect);
-    QVERIFY(animation.property() == "x");
-    QVERIFY(animation.to() == 200);
+    QCOMPARE(animation.target(), &rect);
+    QCOMPARE(animation.property(), QLatin1String("x"));
+    QCOMPARE(animation.to(), qreal(200));
     animation.start();
     QVERIFY(animation.isRunning());
     QTest::qWait(animation.duration());
@@ -161,7 +161,7 @@ void tst_qquickanimations::simpleNumber()
     QVERIFY(animation.isRunning());
     QVERIFY(animation.isPaused());
     animation.setCurrentTime(125);
-    QVERIFY(animation.currentTime() == 125);
+    QCOMPARE(animation.currentTime(), 125);
     QCOMPARE(rect.x(), qreal(100));
 }
 
@@ -172,9 +172,9 @@ void tst_qquickanimations::simpleColor()
     animation.setTargetObject(&rect);
     animation.setProperty("color");
     animation.setTo(QColor("red"));
-    QVERIFY(animation.target() == &rect);
-    QVERIFY(animation.property() == "color");
-    QVERIFY(animation.to() == QColor("red"));
+    QCOMPARE(animation.target(), &rect);
+    QCOMPARE(animation.property(), QLatin1String("color"));
+    QCOMPARE(animation.to(), QColor("red"));
     animation.start();
     QVERIFY(animation.isRunning());
     QTest::qWait(animation.duration());
@@ -186,12 +186,12 @@ void tst_qquickanimations::simpleColor()
     QVERIFY(animation.isRunning());
     QVERIFY(animation.isPaused());
     animation.setCurrentTime(125);
-    QVERIFY(animation.currentTime() == 125);
+    QCOMPARE(animation.currentTime(), 125);
     QCOMPARE(rect.color(), QColor::fromRgbF(0.498039, 0, 0.498039, 1));
 
     rect.setColor(QColor("green"));
     animation.setFrom(QColor("blue"));
-    QVERIFY(animation.from() == QColor("blue"));
+    QCOMPARE(animation.from(), QColor("blue"));
     animation.restart();
     QCOMPARE(rect.color(), QColor("blue"));
     QVERIFY(animation.isRunning());
@@ -206,10 +206,10 @@ void tst_qquickanimations::simpleRotation()
     animation.setTargetObject(&rect);
     animation.setProperty("rotation");
     animation.setTo(270);
-    QVERIFY(animation.target() == &rect);
-    QVERIFY(animation.property() == "rotation");
-    QVERIFY(animation.to() == 270);
-    QVERIFY(animation.direction() == QQuickRotationAnimation::Numerical);
+    QCOMPARE(animation.target(), &rect);
+    QCOMPARE(animation.property(), QLatin1String("rotation"));
+    QCOMPARE(animation.to(), qreal(270));
+    QCOMPARE(animation.direction(), QQuickRotationAnimation::Numerical);
     animation.start();
     QVERIFY(animation.isRunning());
     QTest::qWait(animation.duration());
@@ -221,7 +221,7 @@ void tst_qquickanimations::simpleRotation()
     QVERIFY(animation.isRunning());
     QVERIFY(animation.isPaused());
     animation.setCurrentTime(125);
-    QVERIFY(animation.currentTime() == 125);
+    QCOMPARE(animation.currentTime(), 125);
     QCOMPARE(rect.rotation(), qreal(135));
 }
 
@@ -567,7 +567,7 @@ void tst_qquickanimations::alwaysRunToEnd()
     animation.setDuration(1000);
     animation.setLoops(-1);
     animation.setAlwaysRunToEnd(true);
-    QVERIFY(animation.loops() == -1);
+    QCOMPARE(animation.loops(), -1);
     QVERIFY(animation.alwaysRunToEnd());
 
     QElapsedTimer timer;
@@ -600,7 +600,7 @@ void tst_qquickanimations::complete()
     animation.setFrom(1);
     animation.setTo(200);
     animation.setDuration(500);
-    QVERIFY(animation.from() == 1);
+    QCOMPARE(animation.from().toInt(), 1);
     animation.start();
     QTest::qWait(50);
     animation.stop();
@@ -620,7 +620,7 @@ void tst_qquickanimations::resume()
     animation.setFrom(10);
     animation.setTo(200);
     animation.setDuration(1000);
-    QVERIFY(animation.from() == 10);
+    QCOMPARE(animation.from().toInt(), 10);
 
     animation.start();
     QTest::qWait(400);
@@ -685,7 +685,7 @@ void tst_qquickanimations::dotProperty()
     animation.start();
     animation.pause();
     animation.setCurrentTime(125);
-    QVERIFY(animation.currentTime() == 125);
+    QCOMPARE(animation.currentTime(), 125);
     QCOMPARE(rect.border()->width(), 5.0);
 }
 
@@ -708,7 +708,7 @@ void tst_qquickanimations::badTypes()
         QTest::ignoreMessage(QtWarningMsg, "QQmlComponent: Component is not ready");
         c.create();
 
-        QVERIFY(c.errors().count() == 1);
+        QCOMPARE(c.errors().count(), 1);
         QCOMPARE(c.errors().at(0).description(), QLatin1String("Invalid property assignment: number expected"));
     }
 
@@ -719,7 +719,7 @@ void tst_qquickanimations::badTypes()
         QTest::ignoreMessage(QtWarningMsg, "QQmlComponent: Component is not ready");
         c.create();
 
-        QVERIFY(c.errors().count() == 1);
+        QCOMPARE(c.errors().count(), 1);
         QCOMPARE(c.errors().at(0).description(), QLatin1String("Invalid property assignment: color expected"));
     }
 
@@ -1078,7 +1078,7 @@ void tst_qquickanimations::propertyValueSourceDefaultStart()
 
         QQuickAbstractAnimation *myAnim = rect->findChild<QQuickAbstractAnimation*>("MyAnim");
         QVERIFY(myAnim && !myAnim->qtAnimation());
-        //QVERIFY(myAnim->qtAnimation()->state() == QAbstractAnimationJob::Stopped);
+        //QCOMPARE(myAnim->qtAnimation()->state(), QAbstractAnimationJob::Stopped);
     }
 }
 
@@ -1097,7 +1097,7 @@ void tst_qquickanimations::dontStart()
 
         QQuickAbstractAnimation *myAnim = rect->findChild<QQuickAbstractAnimation*>("MyAnim");
         QVERIFY(myAnim && !myAnim->qtAnimation());
-        //QVERIFY(myAnim->qtAnimation()->state() == QAbstractAnimationJob::Stopped);
+        //QCOMPARE(myAnim->qtAnimation()->state(), QAbstractAnimationJob::Stopped);
     }
 
     {
@@ -1112,7 +1112,7 @@ void tst_qquickanimations::dontStart()
 
         QQuickAbstractAnimation *myAnim = rect->findChild<QQuickAbstractAnimation*>("MyAnim");
         QVERIFY(myAnim && !myAnim->qtAnimation());
-        //QVERIFY(myAnim->qtAnimation()->state() == QAbstractAnimationJob::Stopped);
+        //QCOMPARE(myAnim->qtAnimation()->state(), QAbstractAnimationJob::Stopped);
     }
 }
 
@@ -1350,7 +1350,7 @@ void tst_qquickanimations::alwaysRunToEndRestartBug()
     animation.setDuration(1000);
     animation.setLoops(-1);
     animation.setAlwaysRunToEnd(true);
-    QVERIFY(animation.loops() == -1);
+    QCOMPARE(animation.loops(), -1);
     QVERIFY(animation.alwaysRunToEnd());
     animation.start();
     animation.stop();
@@ -1387,7 +1387,7 @@ void tst_qquickanimations::pauseBindingBug()
     QQuickRectangle *rect = qobject_cast<QQuickRectangle*>(c.create());
     QVERIFY(rect != 0);
     QQuickAbstractAnimation *anim = rect->findChild<QQuickAbstractAnimation*>("animation");
-    QVERIFY(anim->qtAnimation()->state() == QAbstractAnimationJob::Paused);
+    QCOMPARE(anim->qtAnimation()->state(), QAbstractAnimationJob::Paused);
 
     delete rect;
 }
diff --git a/tests/auto/quick/qquickapplication/tst_qquickapplication.cpp b/tests/auto/quick/qquickapplication/tst_qquickapplication.cpp
index 7df020405f..1d8fc430b8 100644
--- a/tests/auto/quick/qquickapplication/tst_qquickapplication.cpp
+++ b/tests/auto/quick/qquickapplication/tst_qquickapplication.cpp
@@ -97,7 +97,7 @@ void tst_qquickapplication::active()
     window.show();
     window.requestActivate();
     QTest::qWaitForWindowActive(&window);
-    QVERIFY(QGuiApplication::focusWindow() == &window);
+    QCOMPARE(QGuiApplication::focusWindow(), &window);
     QVERIFY(item->property("active").toBool());
     QVERIFY(item->property("active2").toBool());
 
@@ -167,7 +167,7 @@ void tst_qquickapplication::state()
         window.show();
         window.requestActivate();
         QTest::qWaitForWindowActive(&window);
-        QVERIFY(QGuiApplication::focusWindow() == &window);
+        QCOMPARE(QGuiApplication::focusWindow(), &window);
         QCOMPARE(Qt::ApplicationState(item->property("state").toInt()), Qt::ApplicationActive);
         QCOMPARE(Qt::ApplicationState(item->property("state2").toInt()), Qt::ApplicationActive);
 
diff --git a/tests/auto/quick/qquickborderimage/tst_qquickborderimage.cpp b/tests/auto/quick/qquickborderimage/tst_qquickborderimage.cpp
index 2a96bd1501..071ea0b494 100644
--- a/tests/auto/quick/qquickborderimage/tst_qquickborderimage.cpp
+++ b/tests/auto/quick/qquickborderimage/tst_qquickborderimage.cpp
@@ -157,12 +157,12 @@ void tst_qquickborderimage::imageSource()
     QVERIFY(obj != 0);
 
     if (remote)
-        QTRY_VERIFY(obj->status() == QQuickBorderImage::Loading);
+        QTRY_COMPARE(obj->status(), QQuickBorderImage::Loading);
 
     QCOMPARE(obj->source(), remote ? source : QUrl(source));
 
     if (error.isEmpty()) {
-        QTRY_VERIFY(obj->status() == QQuickBorderImage::Ready);
+        QTRY_COMPARE(obj->status(), QQuickBorderImage::Ready);
         QCOMPARE(obj->width(), 120.);
         QCOMPARE(obj->height(), 120.);
         QCOMPARE(obj->sourceSize().width(), 120);
@@ -170,7 +170,7 @@ void tst_qquickborderimage::imageSource()
         QCOMPARE(obj->horizontalTileMode(), QQuickBorderImage::Stretch);
         QCOMPARE(obj->verticalTileMode(), QQuickBorderImage::Stretch);
     } else {
-        QTRY_VERIFY(obj->status() == QQuickBorderImage::Error);
+        QTRY_COMPARE(obj->status(), QQuickBorderImage::Error);
     }
 
     delete obj;
@@ -185,13 +185,13 @@ void tst_qquickborderimage::clearSource()
     component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
     QQuickBorderImage *obj = qobject_cast<QQuickBorderImage*>(component.create());
     QVERIFY(obj != 0);
-    QVERIFY(obj->status() == QQuickBorderImage::Ready);
+    QCOMPARE(obj->status(), QQuickBorderImage::Ready);
     QCOMPARE(obj->width(), 120.);
     QCOMPARE(obj->height(), 120.);
 
     ctxt->setContextProperty("srcImage", "");
     QVERIFY(obj->source().isEmpty());
-    QVERIFY(obj->status() == QQuickBorderImage::Null);
+    QCOMPARE(obj->status(), QQuickBorderImage::Null);
     QCOMPARE(obj->width(), 0.);
     QCOMPARE(obj->height(), 0.);
 
@@ -303,14 +303,14 @@ void tst_qquickborderimage::sciSource()
     QVERIFY(obj != 0);
 
     if (remote)
-        QTRY_VERIFY(obj->status() == QQuickBorderImage::Loading);
+        QTRY_COMPARE(obj->status(), QQuickBorderImage::Loading);
 
     QCOMPARE(obj->source(), remote ? source : QUrl(source));
     QCOMPARE(obj->width(), 300.);
     QCOMPARE(obj->height(), 300.);
 
     if (valid) {
-        QTRY_VERIFY(obj->status() == QQuickBorderImage::Ready);
+        QTRY_COMPARE(obj->status(), QQuickBorderImage::Ready);
         QCOMPARE(obj->border()->left(), 10);
         QCOMPARE(obj->border()->top(), 20);
         QCOMPARE(obj->border()->right(), 30);
@@ -318,7 +318,7 @@ void tst_qquickborderimage::sciSource()
         QCOMPARE(obj->horizontalTileMode(), QQuickBorderImage::Round);
         QCOMPARE(obj->verticalTileMode(), QQuickBorderImage::Repeat);
     } else {
-        QTRY_VERIFY(obj->status() == QQuickBorderImage::Error);
+        QTRY_COMPARE(obj->status(), QQuickBorderImage::Error);
     }
 
     delete obj;
@@ -450,7 +450,7 @@ void tst_qquickborderimage::statusChanges()
     obj->setSource(source);
     if (remote)
         server.sendDelayedItem();
-    QTRY_VERIFY(obj->status() == finalStatus);
+    QTRY_COMPARE(obj->status(), finalStatus);
     QCOMPARE(spy.count(), emissions);
 
     delete obj;
@@ -536,8 +536,8 @@ void tst_qquickborderimage::progressAndStatusChanges()
     component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
     QQuickBorderImage *obj = qobject_cast<QQuickBorderImage*>(component.create());
     QVERIFY(obj != 0);
-    QVERIFY(obj->status() == QQuickBorderImage::Ready);
-    QTRY_VERIFY(obj->progress() == 1.0);
+    QCOMPARE(obj->status(), QQuickBorderImage::Ready);
+    QTRY_COMPARE(obj->progress(), 1.0);
 
     qRegisterMetaType<QQuickBorderImage::Status>();
     QSignalSpy sourceSpy(obj, SIGNAL(sourceChanged(QUrl)));
@@ -546,33 +546,33 @@ void tst_qquickborderimage::progressAndStatusChanges()
 
     // Same file
     ctxt->setContextProperty("srcImage", testFileUrl("heart200.png"));
-    QTRY_VERIFY(obj->status() == QQuickBorderImage::Ready);
-    QTRY_VERIFY(obj->progress() == 1.0);
+    QTRY_COMPARE(obj->status(), QQuickBorderImage::Ready);
+    QTRY_COMPARE(obj->progress(), 1.0);
     QTRY_COMPARE(sourceSpy.count(), 0);
     QTRY_COMPARE(progressSpy.count(), 0);
     QTRY_COMPARE(statusSpy.count(), 0);
 
     // Loading local file
     ctxt->setContextProperty("srcImage", testFileUrl("colors.png"));
-    QTRY_VERIFY(obj->status() == QQuickBorderImage::Ready);
-    QTRY_VERIFY(obj->progress() == 1.0);
+    QTRY_COMPARE(obj->status(), QQuickBorderImage::Ready);
+    QTRY_COMPARE(obj->progress(), 1.0);
     QTRY_COMPARE(sourceSpy.count(), 1);
     QTRY_COMPARE(progressSpy.count(), 0);
     QTRY_COMPARE(statusSpy.count(), 1);
 
     // Loading remote file
     ctxt->setContextProperty("srcImage", server.url("/heart200.png"));
-    QTRY_VERIFY(obj->status() == QQuickBorderImage::Loading);
-    QTRY_VERIFY(obj->progress() == 0.0);
-    QTRY_VERIFY(obj->status() == QQuickBorderImage::Ready);
-    QTRY_VERIFY(obj->progress() == 1.0);
+    QTRY_COMPARE(obj->status(), QQuickBorderImage::Loading);
+    QTRY_COMPARE(obj->progress(), 0.0);
+    QTRY_COMPARE(obj->status(), QQuickBorderImage::Ready);
+    QTRY_COMPARE(obj->progress(), 1.0);
     QTRY_COMPARE(sourceSpy.count(), 2);
     QTRY_VERIFY(progressSpy.count() > 1);
     QTRY_COMPARE(statusSpy.count(), 3);
 
     ctxt->setContextProperty("srcImage", "");
-    QTRY_VERIFY(obj->status() == QQuickBorderImage::Null);
-    QTRY_VERIFY(obj->progress() == 0.0);
+    QTRY_COMPARE(obj->status(), QQuickBorderImage::Null);
+    QTRY_COMPARE(obj->progress(), 0.0);
     QTRY_COMPARE(sourceSpy.count(), 3);
     QTRY_VERIFY(progressSpy.count() > 2);
     QTRY_COMPARE(statusSpy.count(), 4);
diff --git a/tests/auto/quick/qquickdynamicpropertyanimation/tst_qquickdynamicpropertyanimation.cpp b/tests/auto/quick/qquickdynamicpropertyanimation/tst_qquickdynamicpropertyanimation.cpp
index 40bd6624f0..3656bb8aab 100644
--- a/tests/auto/quick/qquickdynamicpropertyanimation/tst_qquickdynamicpropertyanimation.cpp
+++ b/tests/auto/quick/qquickdynamicpropertyanimation/tst_qquickdynamicpropertyanimation.cpp
@@ -59,11 +59,11 @@ private:
         QQmlProperty testProp(item, propertyName);
         QPropertyAnimation animation(item, propertyName, this);
         animation.setEndValue(toValue);
-        QVERIFY(animation.targetObject() == item);
-        QVERIFY(animation.propertyName() == propertyName);
-        QVERIFY(animation.endValue().value<T>() == toValue);
+        QCOMPARE(animation.targetObject(), item);
+        QCOMPARE(animation.propertyName(), propertyName);
+        QCOMPARE(animation.endValue().value<T>(), toValue);
         animation.start();
-        QVERIFY(animation.state() == QAbstractAnimation::Running);
+        QCOMPARE(animation.state(), QAbstractAnimation::Running);
         QTest::qWait(animation.duration());
         QTRY_COMPARE(testProp.read().value<T>(), toValue);
     }
diff --git a/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp b/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp
index 30d4144654..eee7ffe560 100644
--- a/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp
+++ b/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp
@@ -212,28 +212,28 @@ void tst_qquickflickable::boundsBehavior()
     QSignalSpy spy(flickable, SIGNAL(boundsBehaviorChanged()));
 
     QVERIFY(flickable);
-    QVERIFY(flickable->boundsBehavior() == QQuickFlickable::StopAtBounds);
+    QCOMPARE(flickable->boundsBehavior(), QQuickFlickable::StopAtBounds);
 
     flickable->setBoundsBehavior(QQuickFlickable::DragAndOvershootBounds);
-    QVERIFY(flickable->boundsBehavior() == QQuickFlickable::DragAndOvershootBounds);
+    QCOMPARE(flickable->boundsBehavior(), QQuickFlickable::DragAndOvershootBounds);
     QCOMPARE(spy.count(),1);
     flickable->setBoundsBehavior(QQuickFlickable::DragAndOvershootBounds);
     QCOMPARE(spy.count(),1);
 
     flickable->setBoundsBehavior(QQuickFlickable::DragOverBounds);
-    QVERIFY(flickable->boundsBehavior() == QQuickFlickable::DragOverBounds);
+    QCOMPARE(flickable->boundsBehavior(), QQuickFlickable::DragOverBounds);
     QCOMPARE(spy.count(),2);
     flickable->setBoundsBehavior(QQuickFlickable::DragOverBounds);
     QCOMPARE(spy.count(),2);
 
     flickable->setBoundsBehavior(QQuickFlickable::StopAtBounds);
-    QVERIFY(flickable->boundsBehavior() == QQuickFlickable::StopAtBounds);
+    QCOMPARE(flickable->boundsBehavior(), QQuickFlickable::StopAtBounds);
     QCOMPARE(spy.count(),3);
     flickable->setBoundsBehavior(QQuickFlickable::StopAtBounds);
     QCOMPARE(spy.count(),3);
 
     flickable->setBoundsBehavior(QQuickFlickable::OvershootBounds);
-    QVERIFY(flickable->boundsBehavior() == QQuickFlickable::OvershootBounds);
+    QCOMPARE(flickable->boundsBehavior(), QQuickFlickable::OvershootBounds);
     QCOMPARE(spy.count(),4);
     flickable->setBoundsBehavior(QQuickFlickable::OvershootBounds);
     QCOMPARE(spy.count(),4);
@@ -688,10 +688,10 @@ void tst_qquickflickable::wheel()
     }
 
     QTRY_VERIFY(flick->contentY() > 0);
-    QVERIFY(flick->contentX() == 0);
+    QCOMPARE(flick->contentX(), qreal(0));
 
     flick->setContentY(0);
-    QVERIFY(flick->contentY() == 0);
+    QCOMPARE(flick->contentY(), qreal(0));
 
     {
         QPoint pos(200, 200);
@@ -702,7 +702,7 @@ void tst_qquickflickable::wheel()
     }
 
     QTRY_VERIFY(flick->contentX() > 0);
-    QVERIFY(flick->contentY() == 0);
+    QCOMPARE(flick->contentY(), qreal(0));
 }
 
 void tst_qquickflickable::movingAndFlicking_data()
@@ -1202,12 +1202,12 @@ void tst_qquickflickable::flickVelocity()
     // flick up
     flick(window.data(), QPoint(20,190), QPoint(20, 50), 200);
     QVERIFY(flickable->verticalVelocity() > 0.0);
-    QTRY_VERIFY(flickable->verticalVelocity() == 0.0);
+    QTRY_COMPARE(flickable->verticalVelocity(), 0.0);
 
     // flick down
     flick(window.data(), QPoint(20,10), QPoint(20, 140), 200);
     QTRY_VERIFY(flickable->verticalVelocity() < 0.0);
-    QTRY_VERIFY(flickable->verticalVelocity() == 0.0);
+    QTRY_COMPARE(flickable->verticalVelocity(), 0.0);
 
 #ifdef Q_OS_MAC
     QSKIP("boost doesn't work on OS X");
@@ -1226,7 +1226,7 @@ void tst_qquickflickable::flickVelocity()
     // Flick in opposite direction -> boost cancelled.
     flick(window.data(), QPoint(20,10), QPoint(20, 340), 200);
     QTRY_VERIFY(flickable->verticalVelocity() < 0.0);
-    QVERIFY(fp->flickBoost == 1.0);
+    QCOMPARE(fp->flickBoost, 1.0);
 }
 
 void tst_qquickflickable::margins()
diff --git a/tests/auto/quick/qquickflipable/tst_qquickflipable.cpp b/tests/auto/quick/qquickflipable/tst_qquickflipable.cpp
index 76bf509cf0..2eb8942eee 100644
--- a/tests/auto/quick/qquickflipable/tst_qquickflipable.cpp
+++ b/tests/auto/quick/qquickflipable/tst_qquickflipable.cpp
@@ -108,11 +108,11 @@ void tst_qquickflipable::flipFlipable()
     QQmlComponent c(&engine, testFileUrl("flip-flipable.qml"));
     QQuickFlipable *obj = qobject_cast<QQuickFlipable*>(c.create());
     QVERIFY(obj != 0);
-    QVERIFY(obj->side() == QQuickFlipable::Front);
+    QCOMPARE(obj->side(), QQuickFlipable::Front);
     obj->setProperty("flipped", QVariant(true));
-    QTRY_VERIFY(obj->side() == QQuickFlipable::Back);
-    QTRY_VERIFY(obj->side() == QQuickFlipable::Front);
-    QTRY_VERIFY(obj->side() == QQuickFlipable::Back);
+    QTRY_COMPARE(obj->side(), QQuickFlipable::Back);
+    QTRY_COMPARE(obj->side(), QQuickFlipable::Front);
+    QTRY_COMPARE(obj->side(), QQuickFlipable::Back);
     delete obj;
 }
 
diff --git a/tests/auto/quick/qquickfocusscope/tst_qquickfocusscope.cpp b/tests/auto/quick/qquickfocusscope/tst_qquickfocusscope.cpp
index 76e33dae11..4b377f92d6 100644
--- a/tests/auto/quick/qquickfocusscope/tst_qquickfocusscope.cpp
+++ b/tests/auto/quick/qquickfocusscope/tst_qquickfocusscope.cpp
@@ -81,7 +81,7 @@ void tst_qquickfocusscope::basic()
     view->requestActivate();
 
     QTest::qWaitForWindowActive(view);
-    QTRY_VERIFY(view == qGuiApp->focusWindow());
+    QTRY_COMPARE(view, qGuiApp->focusWindow());
 
     QVERIFY(view->isTopLevel());
     QVERIFY(item0->hasActiveFocus());
@@ -126,7 +126,7 @@ void tst_qquickfocusscope::nested()
     view->requestActivate();
 
     QTest::qWaitForWindowActive(view);
-    QTRY_VERIFY(view == qGuiApp->focusWindow());
+    QTRY_COMPARE(view, qGuiApp->focusWindow());
 
     QVERIFY(item1->hasActiveFocus());
     QVERIFY(item2->hasActiveFocus());
@@ -153,7 +153,7 @@ void tst_qquickfocusscope::noFocus()
     view->show();
     view->requestActivate();
     QVERIFY(QTest::qWaitForWindowActive(view));
-    QVERIFY(view == qGuiApp->focusWindow());
+    QCOMPARE(view, qGuiApp->focusWindow());
 
     QVERIFY(!item0->hasActiveFocus());
     QVERIFY(!item1->hasActiveFocus());
@@ -194,7 +194,7 @@ void tst_qquickfocusscope::textEdit()
 
     QTest::qWaitForWindowActive(view);
 
-    QTRY_VERIFY(view == qGuiApp->focusWindow());
+    QTRY_COMPARE(view, qGuiApp->focusWindow());
     QVERIFY(item0->hasActiveFocus());
     QVERIFY(item1->hasActiveFocus());
     QVERIFY(!item2->hasActiveFocus());
@@ -246,7 +246,7 @@ void tst_qquickfocusscope::forceFocus()
     view->show();
     view->requestActivate();
     QTest::qWaitForWindowActive(view);
-    QTRY_VERIFY(view == qGuiApp->focusWindow());
+    QTRY_COMPARE(view, qGuiApp->focusWindow());
 
     QVERIFY(item0->hasActiveFocus());
     QVERIFY(item1->hasActiveFocus());
@@ -283,7 +283,7 @@ void tst_qquickfocusscope::noParentFocus()
     view->show();
     view->requestActivate();
     QTest::qWaitForWindowActive(view);
-    QTRY_VERIFY(view == qGuiApp->focusWindow());
+    QTRY_COMPARE(view, qGuiApp->focusWindow());
 
     QVERIFY(!view->rootObject()->property("focus1").toBool());
     QVERIFY(!view->rootObject()->property("focus2").toBool());
@@ -312,7 +312,7 @@ void tst_qquickfocusscope::signalEmission()
     view->requestActivate();
 
     QTest::qWaitForWindowActive(view);
-    QTRY_VERIFY(view == qGuiApp->focusWindow());
+    QTRY_COMPARE(view, qGuiApp->focusWindow());
 
     QVariant blue(QColor("blue"));
     QVariant red(QColor("red"));
@@ -362,7 +362,7 @@ void tst_qquickfocusscope::qtBug13380()
 
     QVERIFY(QTest::qWaitForWindowExposed(view));
 
-    QTRY_VERIFY(view == qGuiApp->focusWindow());
+    QTRY_COMPARE(view, qGuiApp->focusWindow());
     QVERIFY(view->rootObject()->property("noFocus").toBool());
 
     view->rootObject()->setProperty("showRect", true);
@@ -379,7 +379,7 @@ void tst_qquickfocusscope::forceActiveFocus()
     view->show();
     view->requestActivate();
     QVERIFY(QTest::qWaitForWindowExposed(view));
-    QTRY_VERIFY(view == qGuiApp->focusWindow());
+    QTRY_COMPARE(view, qGuiApp->focusWindow());
 
     QQuickItem *rootObject = view->rootObject();
     QVERIFY(rootObject);
@@ -532,7 +532,7 @@ void tst_qquickfocusscope::canvasFocus()
     view->requestActivate();
 
     QVERIFY(QTest::qWaitForWindowActive(view));
-    QVERIFY(view == qGuiApp->focusWindow());
+    QCOMPARE(view, qGuiApp->focusWindow());
 
     // Now the window has focus, active focus given to item1
     QCOMPARE(rootItem->hasFocus(), true);
@@ -558,7 +558,7 @@ void tst_qquickfocusscope::canvasFocus()
     alternateView.show();
     alternateView.requestActivate();
     QVERIFY(QTest::qWaitForWindowActive(&alternateView));
-    QVERIFY(QGuiApplication::focusWindow() == &alternateView);
+    QCOMPARE(QGuiApplication::focusWindow(), &alternateView);
 
     QCOMPARE(rootItem->hasFocus(), false);
     QCOMPARE(rootItem->hasActiveFocus(), false);
@@ -604,7 +604,7 @@ void tst_qquickfocusscope::canvasFocus()
     view->show();
     view->requestActivate();
     QVERIFY(QTest::qWaitForWindowActive(view));
-    QVERIFY(QGuiApplication::focusWindow() == view);
+    QCOMPARE(QGuiApplication::focusWindow(), view);
 
     QCOMPARE(rootItem->hasFocus(), true);
     QCOMPARE(rootItem->hasActiveFocus(), true);
diff --git a/tests/auto/quick/qquickfontloader/tst_qquickfontloader.cpp b/tests/auto/quick/qquickfontloader/tst_qquickfontloader.cpp
index a084c86a95..f4f1e290c1 100644
--- a/tests/auto/quick/qquickfontloader/tst_qquickfontloader.cpp
+++ b/tests/auto/quick/qquickfontloader/tst_qquickfontloader.cpp
@@ -85,7 +85,7 @@ void tst_qquickfontloader::noFont()
     QVERIFY(fontObject != 0);
     QCOMPARE(fontObject->name(), QString(""));
     QCOMPARE(fontObject->source(), QUrl(""));
-    QTRY_VERIFY(fontObject->status() == QQuickFontLoader::Null);
+    QTRY_COMPARE(fontObject->status(), QQuickFontLoader::Null);
 
     delete fontObject;
 }
@@ -100,7 +100,7 @@ void tst_qquickfontloader::namedFont()
     QVERIFY(fontObject != 0);
     QCOMPARE(fontObject->source(), QUrl(""));
     QCOMPARE(fontObject->name(), QString("Helvetica"));
-    QTRY_VERIFY(fontObject->status() == QQuickFontLoader::Ready);
+    QTRY_COMPARE(fontObject->status(), QQuickFontLoader::Ready);
 }
 
 void tst_qquickfontloader::localFont()
@@ -113,7 +113,7 @@ void tst_qquickfontloader::localFont()
     QVERIFY(fontObject != 0);
     QVERIFY(fontObject->source() != QUrl(""));
     QTRY_COMPARE(fontObject->name(), QString("OCRA"));
-    QTRY_VERIFY(fontObject->status() == QQuickFontLoader::Ready);
+    QTRY_COMPARE(fontObject->status(), QQuickFontLoader::Ready);
 }
 
 void tst_qquickfontloader::failLocalFont()
@@ -127,7 +127,7 @@ void tst_qquickfontloader::failLocalFont()
     QVERIFY(fontObject != 0);
     QVERIFY(fontObject->source() != QUrl(""));
     QTRY_COMPARE(fontObject->name(), QString(""));
-    QTRY_VERIFY(fontObject->status() == QQuickFontLoader::Error);
+    QTRY_COMPARE(fontObject->status(), QQuickFontLoader::Error);
 }
 
 void tst_qquickfontloader::webFont()
@@ -141,7 +141,7 @@ void tst_qquickfontloader::webFont()
     QVERIFY(fontObject != 0);
     QVERIFY(fontObject->source() != QUrl(""));
     QTRY_COMPARE(fontObject->name(), QString("OCRA"));
-    QTRY_VERIFY(fontObject->status() == QQuickFontLoader::Ready);
+    QTRY_COMPARE(fontObject->status(), QQuickFontLoader::Ready);
 }
 
 void tst_qquickfontloader::redirWebFont()
@@ -157,7 +157,7 @@ void tst_qquickfontloader::redirWebFont()
     QVERIFY(fontObject != 0);
     QVERIFY(fontObject->source() != QUrl(""));
     QTRY_COMPARE(fontObject->name(), QString("OCRA"));
-    QTRY_VERIFY(fontObject->status() == QQuickFontLoader::Ready);
+    QTRY_COMPARE(fontObject->status(), QQuickFontLoader::Ready);
 }
 
 void tst_qquickfontloader::failWebFont()
@@ -172,7 +172,7 @@ void tst_qquickfontloader::failWebFont()
     QVERIFY(fontObject != 0);
     QVERIFY(fontObject->source() != QUrl(""));
     QTRY_COMPARE(fontObject->name(), QString(""));
-    QTRY_VERIFY(fontObject->status() == QQuickFontLoader::Error);
+    QTRY_COMPARE(fontObject->status(), QQuickFontLoader::Error);
 }
 
 void tst_qquickfontloader::changeFont()
@@ -189,26 +189,26 @@ void tst_qquickfontloader::changeFont()
     QSignalSpy nameSpy(fontObject, SIGNAL(nameChanged()));
     QSignalSpy statusSpy(fontObject, SIGNAL(statusChanged()));
 
-    QTRY_VERIFY(fontObject->status() == QQuickFontLoader::Ready);
+    QTRY_COMPARE(fontObject->status(), QQuickFontLoader::Ready);
     QCOMPARE(nameSpy.count(), 0);
     QCOMPARE(statusSpy.count(), 0);
     QTRY_COMPARE(fontObject->name(), QString("OCRA"));
 
     ctxt->setContextProperty("font", server.urlString("/daniel.ttf"));
-    QTRY_VERIFY(fontObject->status() == QQuickFontLoader::Loading);
-    QTRY_VERIFY(fontObject->status() == QQuickFontLoader::Ready);
+    QTRY_COMPARE(fontObject->status(), QQuickFontLoader::Loading);
+    QTRY_COMPARE(fontObject->status(), QQuickFontLoader::Ready);
     QCOMPARE(nameSpy.count(), 1);
     QCOMPARE(statusSpy.count(), 2);
     QTRY_COMPARE(fontObject->name(), QString("Daniel"));
 
     ctxt->setContextProperty("font", testFileUrl("tarzeau_ocr_a.ttf"));
-    QTRY_VERIFY(fontObject->status() == QQuickFontLoader::Ready);
+    QTRY_COMPARE(fontObject->status(), QQuickFontLoader::Ready);
     QCOMPARE(nameSpy.count(), 2);
     QCOMPARE(statusSpy.count(), 2);
     QTRY_COMPARE(fontObject->name(), QString("OCRA"));
 
     ctxt->setContextProperty("font", server.urlString("/daniel.ttf"));
-    QTRY_VERIFY(fontObject->status() == QQuickFontLoader::Ready);
+    QTRY_COMPARE(fontObject->status(), QQuickFontLoader::Ready);
     QCOMPARE(nameSpy.count(), 3);
     QCOMPARE(statusSpy.count(), 2);
     QTRY_COMPARE(fontObject->name(), QString("Daniel"));
@@ -224,7 +224,7 @@ void tst_qquickfontloader::changeFontSourceViaState()
 
     QQuickFontLoader *fontObject = qobject_cast<QQuickFontLoader*>(qvariant_cast<QObject *>(window.rootObject()->property("fontloader")));
     QVERIFY(fontObject != 0);
-    QTRY_VERIFY(fontObject->status() == QQuickFontLoader::Ready);
+    QTRY_COMPARE(fontObject->status(), QQuickFontLoader::Ready);
     QVERIFY(fontObject->source() != QUrl(""));
     QTRY_COMPARE(fontObject->name(), QString("OCRA"));
 
@@ -236,7 +236,7 @@ void tst_qquickfontloader::changeFontSourceViaState()
     QTest::ignoreMessage(QtWarningMsg, qPrintable(warning));
 
     QEXPECT_FAIL("", "QTBUG-20268", Abort);
-    QTRY_VERIFY(fontObject->status() == QQuickFontLoader::Ready);
+    QTRY_COMPARE(fontObject->status(), QQuickFontLoader::Ready);
     QCOMPARE(window.rootObject()->property("name").toString(), QString("Tahoma"));
 }
 
diff --git a/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp b/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp
index b4b44a4e58..87042ca7ba 100644
--- a/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp
+++ b/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp
@@ -378,7 +378,7 @@ void tst_QQuickGridView::items()
     ctxt->setContextProperty("testModel", &model2);
 
     int itemCount = findItems<QQuickItem>(contentItem, "wrapper").count();
-    QTRY_VERIFY(itemCount == 0);
+    QTRY_COMPARE(itemCount, 0);
 
     delete window;
 }
@@ -478,8 +478,8 @@ void tst_QQuickGridView::inserted_basic()
     // Confirm items positioned correctly
     for (int i = 0; i < model.count(); ++i) {
         QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i);
-        QTRY_VERIFY(item->x() == (i%3)*80);
-        QTRY_VERIFY(item->y() == (i/3)*60);
+        QTRY_COMPARE(item->x(), qreal((i%3)*80));
+        QTRY_COMPARE(item->y(), qreal((i/3)*60));
     }
 
     for (int i = model.count(); i < 30; ++i)
@@ -490,7 +490,7 @@ void tst_QQuickGridView::inserted_basic()
     // Insert item outside visible area
     model.insertItem(1, "Hello", "1324");
 
-    QTRY_VERIFY(gridview->contentY() == 120);
+    QTRY_COMPARE(gridview->contentY(), qreal(120));
 
     delete window;
 }
@@ -820,8 +820,8 @@ void tst_QQuickGridView::removed_basic()
     for (int i = 0; i < model.count() && i < itemCount; ++i) {
         QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i);
         if (!item) qWarning() << "Item" << i << "not found";
-        QTRY_VERIFY(item->x() == (i%3)*80);
-        QTRY_VERIFY(item->y() == (i/3)*60);
+        QTRY_COMPARE(item->x(), qreal((i%3)*80));
+        QTRY_COMPARE(item->y(), qreal((i/3)*60));
     }
 
     // Remove first item (which is the current item);
@@ -841,8 +841,8 @@ void tst_QQuickGridView::removed_basic()
     for (int i = 0; i < model.count() && i < itemCount; ++i) {
         QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i);
         if (!item) qWarning() << "Item" << i << "not found";
-        QTRY_VERIFY(item->x() == (i%3)*80);
-        QTRY_VERIFY(item->y() == (i/3)*60);
+        QTRY_COMPARE(item->x(), qreal((i%3)*80));
+        QTRY_COMPARE(item->y(), qreal((i/3)*60));
     }
 
     // Remove items not visible
@@ -854,8 +854,8 @@ void tst_QQuickGridView::removed_basic()
     for (int i = 0; i < model.count() && i < itemCount; ++i) {
         QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i);
         if (!item) qWarning() << "Item" << i << "not found";
-        QTRY_VERIFY(item->x() == (i%3)*80);
-        QTRY_VERIFY(item->y() == (i/3)*60);
+        QTRY_COMPARE(item->x(), qreal((i%3)*80));
+        QTRY_COMPARE(item->y(), qreal((i/3)*60));
     }
 
     // Remove items before visible
@@ -872,8 +872,8 @@ void tst_QQuickGridView::removed_basic()
     for (int i = 6; i < 18; ++i) {
         QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i);
         if (!item) qWarning() << "Item" << i << "not found";
-        QTRY_VERIFY(item->x() == (i%3)*80);
-        QTRY_VERIFY(item->y() == (i/3)*60);
+        QTRY_COMPARE(item->x(), qreal((i%3)*80));
+        QTRY_COMPARE(item->y(), qreal((i/3)*60));
     }
 
     // Remove currentIndex
@@ -891,8 +891,8 @@ void tst_QQuickGridView::removed_basic()
     itemCount = findItems<QQuickItem>(contentItem, "wrapper").count();
     for (int i = 0; i < model.count() && i < itemCount; ++i) {
         QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i);
-        QTRY_VERIFY(item->x() == (i%3)*80);
-        QTRY_VERIFY(item->y() == (i/3)*60);
+        QTRY_COMPARE(item->x(), qreal((i%3)*80));
+        QTRY_COMPARE(item->y(), qreal((i/3)*60));
     }
 
     // remove item outside current view.
@@ -900,7 +900,7 @@ void tst_QQuickGridView::removed_basic()
     gridview->setContentY(240);
 
     model.removeItem(30);
-    QTRY_VERIFY(gridview->currentIndex() == 31);
+    QTRY_COMPARE(gridview->currentIndex(), 31);
 
     // remove current item beyond visible items.
     gridview->setCurrentIndex(20);
@@ -917,7 +917,7 @@ void tst_QQuickGridView::removed_basic()
     model.removeItem(6);
 
     QTRY_COMPARE(gridview->currentIndex(), 7);
-    QTRY_VERIFY(gridview->currentItem() == oldCurrent);
+    QTRY_COMPARE(gridview->currentItem(), oldCurrent);
 
     delete window;
 }
@@ -1216,7 +1216,7 @@ void tst_QQuickGridView::addOrRemoveBeforeVisible()
     for (int i = 0; i < model.count() && i < itemCount; ++i) {
         QTRY_VERIFY(findItem<QQuickItem>(contentItem, "wrapper", i));
         QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i);
-        QTRY_VERIFY(item->x() == (i%3)*80);
+        QTRY_COMPARE(item->x(), qreal((i%3)*80));
         QTRY_VERIFY(item->y() == (i/3)*60 + newTopContentY);
     }
 
@@ -1254,10 +1254,10 @@ void tst_QQuickGridView::clear()
     model.clear();
     gridview->forceLayout();
 
-    QVERIFY(gridview->count() == 0);
-    QVERIFY(gridview->currentItem() == 0);
-    QVERIFY(gridview->contentY() == 0);
-    QVERIFY(gridview->currentIndex() == -1);
+    QCOMPARE(gridview->count(), 0);
+    QVERIFY(!gridview->currentItem());
+    QCOMPARE(gridview->contentY(), qreal(0));
+    QCOMPARE(gridview->currentIndex(), -1);
     QCOMPARE(gridview->contentHeight(), 0.0);
 
     // confirm sanity when adding an item to cleared list
@@ -1265,7 +1265,7 @@ void tst_QQuickGridView::clear()
     gridview->forceLayout();
     QTRY_COMPARE(gridview->count(), 1);
     QVERIFY(gridview->currentItem() != 0);
-    QVERIFY(gridview->currentIndex() == 0);
+    QCOMPARE(gridview->currentIndex(), 0);
 
     delete window;
 }
@@ -1804,7 +1804,7 @@ void tst_QQuickGridView::swapWithFirstItem()
     // ensure content position is stable
     gridview->setContentY(0);
     model.moveItem(10, 0);
-    QTRY_VERIFY(gridview->contentY() == 0);
+    QTRY_COMPARE(gridview->contentY(), qreal(0));
 
     delete window;
 }
@@ -1854,7 +1854,7 @@ void tst_QQuickGridView::currentIndex()
     gridview->setCurrentIndex(35);
     QTRY_VERIFY(gridview->verticalVelocity() != 0.0);
     gridview->setCurrentIndex(0);
-    QTRY_VERIFY(gridview->verticalVelocity() == 0.0);
+    QTRY_COMPARE(gridview->verticalVelocity(), 0.0);
 
     // footer should become visible if it is out of view, and then current index moves to the first row
     window->rootObject()->setProperty("showFooter", true);
@@ -1976,7 +1976,7 @@ void tst_QQuickGridView::keyNavigation()
 
     window->requestActivate();
     QTest::qWaitForWindowActive(window);
-    QTRY_VERIFY(qGuiApp->focusWindow() == window);
+    QTRY_COMPARE(qGuiApp->focusWindow(), window);
     QCOMPARE(gridview->currentIndex(), 0);
 
     QTest::keyClick(window, forwardsKey);
@@ -2261,15 +2261,15 @@ void tst_QQuickGridView::defaultValues()
     QQuickGridView *obj = qobject_cast<QQuickGridView*>(c.create());
 
     QTRY_VERIFY(obj != 0);
-    QTRY_VERIFY(obj->model() == QVariant());
-    QTRY_VERIFY(obj->delegate() == 0);
+    QTRY_COMPARE(obj->model(), QVariant());
+    QTRY_VERIFY(!obj->delegate());
     QTRY_COMPARE(obj->currentIndex(), -1);
-    QTRY_VERIFY(obj->currentItem() == 0);
+    QTRY_VERIFY(!obj->currentItem());
     QTRY_COMPARE(obj->count(), 0);
-    QTRY_VERIFY(obj->highlight() == 0);
-    QTRY_VERIFY(obj->highlightItem() == 0);
+    QTRY_VERIFY(!obj->highlight());
+    QTRY_VERIFY(!obj->highlightItem());
     QTRY_COMPARE(obj->highlightFollowsCurrentItem(), true);
-    QTRY_VERIFY(obj->flow() == 0);
+    QTRY_COMPARE(obj->flow(), QQuickGridView::FlowLeftToRight);
     QTRY_COMPARE(obj->isWrapEnabled(), false);
 #ifdef QML_VIEW_DEFAULTCACHEBUFFER
     QTRY_COMPARE(obj->cacheBuffer(), QML_VIEW_DEFAULTCACHEBUFFER);
@@ -2296,7 +2296,7 @@ void tst_QQuickGridView::properties()
     QTRY_VERIFY(obj->highlight() != 0);
     QTRY_VERIFY(obj->highlightItem() != 0);
     QTRY_COMPARE(obj->highlightFollowsCurrentItem(), false);
-    QTRY_VERIFY(obj->flow() == 0);
+    QTRY_COMPARE(obj->flow(), QQuickGridView::FlowLeftToRight);
     QTRY_COMPARE(obj->isWrapEnabled(), true);
     QTRY_COMPARE(obj->cacheBuffer(), 200);
     QTRY_COMPARE(obj->cellWidth(), qreal(100));
@@ -2733,7 +2733,7 @@ void tst_QQuickGridView::mirroring()
     foreach (const QString objectName, objectNames)
         QCOMPARE(findItem<QQuickItem>(gridviewA, objectName)->x(), findItem<QQuickItem>(gridviewB, objectName)->x());
 
-    QVERIFY(gridviewB->layoutDirection() == gridviewB->effectiveLayoutDirection());
+    QCOMPARE(gridviewB->layoutDirection(), gridviewB->effectiveLayoutDirection());
     QQuickItemPrivate::get(gridviewB)->setLayoutMirror(true);
     QVERIFY(gridviewB->layoutDirection() != gridviewB->effectiveLayoutDirection());
 
@@ -3021,7 +3021,7 @@ void tst_QQuickGridView::footer()
 
     QQuickText *footer = findItem<QQuickText>(contentItem, "footer");
     QVERIFY(footer);
-    QVERIFY(footer == gridview->footerItem());
+    QCOMPARE(footer, gridview->footerItem());
 
     QCOMPARE(footer->position(), initialFooterPos);
     QCOMPARE(footer->width(), 100.);
@@ -3087,7 +3087,7 @@ void tst_QQuickGridView::footer()
     QVERIFY(!footer);
     footer = findItem<QQuickText>(contentItem, "footer2");
     QVERIFY(footer);
-    QVERIFY(footer == gridview->footerItem());
+    QCOMPARE(footer, gridview->footerItem());
 
     QCOMPARE(footer->position(), changedFooterPos);
     QCOMPARE(footer->width(), 50.);
@@ -3270,7 +3270,7 @@ void tst_QQuickGridView::header()
 
     QQuickText *header = findItem<QQuickText>(contentItem, "header");
     QVERIFY(header);
-    QVERIFY(header == gridview->headerItem());
+    QCOMPARE(header, gridview->headerItem());
 
     QCOMPARE(header->position(), initialHeaderPos);
     QCOMPARE(header->width(), 100.);
@@ -3307,7 +3307,7 @@ void tst_QQuickGridView::header()
     header = findItem<QQuickText>(contentItem, "header2");
     QVERIFY(header);
 
-    QVERIFY(header == gridview->headerItem());
+    QCOMPARE(header, gridview->headerItem());
 
     QCOMPARE(header->position(), changedHeaderPos);
     QCOMPARE(header->width(), 50.);
@@ -3614,11 +3614,11 @@ void tst_QQuickGridView::resetModel_headerFooter()
 
     // A reset should not force a new header or footer to be created.
     QQuickItem *newHeader = findItem<QQuickItem>(contentItem, "header");
-    QVERIFY(newHeader == header);
+    QCOMPARE(newHeader, header);
     QCOMPARE(header->y(), -header->height());
 
     QQuickItem *newFooter = findItem<QQuickItem>(contentItem, "footer");
-    QVERIFY(newFooter == footer);
+    QCOMPARE(newFooter, footer);
     QCOMPARE(footer->y(), 60.*2);
 
     delete window;
@@ -5826,7 +5826,7 @@ void tst_QQuickGridView::cacheBuffer()
     window->engine()->setIncubationController(&controller);
 
     window->rootObject()->setProperty("cacheBuffer", 200);
-    QTRY_VERIFY(gridview->cacheBuffer() == 200);
+    QTRY_COMPARE(gridview->cacheBuffer(), 200);
 
     // items will be created one at a time
     for (int i = itemCount; i < qMin(itemCount+9,model.count()); ++i) {
@@ -5926,8 +5926,8 @@ void tst_QQuickGridView::asynchronous()
     for (int i = 0; i < 12; ++i) {
         QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i);
         if (!item) qWarning() << "Item" << i << "not found";
-        QVERIFY(item->x() == (i%3)*100);
-        QVERIFY(item->y() == (i/3)*100);
+        QCOMPARE(item->x(), qreal((i%3)*100));
+        QCOMPARE(item->y(), qreal((i/3)*100));
     }
 
     delete window;
@@ -6345,7 +6345,7 @@ void tst_QQuickGridView::matchIndexLists(const QVariantList &indexLists, const Q
 void tst_QQuickGridView::matchItemsAndIndexes(const QVariantMap &items, const QaimModel &model, const QList<int> &expectedIndexes)
 {
     for (QVariantMap::const_iterator it = items.begin(); it != items.end(); ++it) {
-        QVERIFY(it.value().type() == QVariant::Int);
+        QCOMPARE(it.value().type(), QVariant::Int);
         QString name = it.key();
         int itemIndex = it.value().toInt();
         QVERIFY2(expectedIndexes.contains(itemIndex), QTest::toString(QString("Index %1 not found in expectedIndexes").arg(itemIndex)));
diff --git a/tests/auto/quick/qquickimage/tst_qquickimage.cpp b/tests/auto/quick/qquickimage/tst_qquickimage.cpp
index 337bb6606b..71e9d747f4 100644
--- a/tests/auto/quick/qquickimage/tst_qquickimage.cpp
+++ b/tests/auto/quick/qquickimage/tst_qquickimage.cpp
@@ -121,7 +121,7 @@ void tst_qquickimage::noSource()
     QQuickImage *obj = qobject_cast<QQuickImage*>(component.create());
     QVERIFY(obj != 0);
     QCOMPARE(obj->source(), QUrl());
-    QVERIFY(obj->status() == QQuickImage::Null);
+    QCOMPARE(obj->status(), QQuickImage::Null);
     QCOMPARE(obj->width(), 0.);
     QCOMPARE(obj->height(), 0.);
     QCOMPARE(obj->fillMode(), QQuickImage::Stretch);
@@ -211,18 +211,18 @@ void tst_qquickimage::imageSource()
         QVERIFY(!obj->cache());
 
     if (remote || async)
-        QTRY_VERIFY(obj->status() == QQuickImage::Loading);
+        QTRY_COMPARE(obj->status(), QQuickImage::Loading);
 
     QCOMPARE(obj->source(), remote ? source : QUrl(source));
 
     if (error.isEmpty()) {
-        QTRY_VERIFY(obj->status() == QQuickImage::Ready);
+        QTRY_COMPARE(obj->status(), QQuickImage::Ready);
         QCOMPARE(obj->width(), qreal(width));
         QCOMPARE(obj->height(), qreal(height));
         QCOMPARE(obj->fillMode(), QQuickImage::Stretch);
         QCOMPARE(obj->progress(), 1.0);
     } else {
-        QTRY_VERIFY(obj->status() == QQuickImage::Error);
+        QTRY_COMPARE(obj->status(), QQuickImage::Error);
     }
 
     delete obj;
@@ -237,14 +237,14 @@ void tst_qquickimage::clearSource()
     component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
     QQuickImage *obj = qobject_cast<QQuickImage*>(component.create());
     QVERIFY(obj != 0);
-    QVERIFY(obj->status() == QQuickImage::Ready);
+    QCOMPARE(obj->status(), QQuickImage::Ready);
     QCOMPARE(obj->width(), 120.);
     QCOMPARE(obj->height(), 120.);
     QCOMPARE(obj->progress(), 1.0);
 
     ctxt->setContextProperty("srcImage", "");
     QVERIFY(obj->source().isEmpty());
-    QVERIFY(obj->status() == QQuickImage::Null);
+    QCOMPARE(obj->status(), QQuickImage::Null);
     QCOMPARE(obj->width(), 0.);
     QCOMPARE(obj->height(), 0.);
     QCOMPARE(obj->progress(), 0.0);
@@ -545,7 +545,7 @@ void tst_qquickimage::noLoading()
     component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
     QQuickImage *obj = qobject_cast<QQuickImage*>(component.create());
     QVERIFY(obj != 0);
-    QVERIFY(obj->status() == QQuickImage::Ready);
+    QCOMPARE(obj->status(), QQuickImage::Ready);
 
     QSignalSpy sourceSpy(obj, SIGNAL(sourceChanged(QUrl)));
     QSignalSpy progressSpy(obj, SIGNAL(progressChanged(qreal)));
@@ -553,18 +553,18 @@ void tst_qquickimage::noLoading()
 
     // Loading local file
     ctxt->setContextProperty("srcImage", testFileUrl("green.png"));
-    QTRY_VERIFY(obj->status() == QQuickImage::Ready);
-    QTRY_VERIFY(obj->progress() == 1.0);
+    QTRY_COMPARE(obj->status(), QQuickImage::Ready);
+    QTRY_COMPARE(obj->progress(), 1.0);
     QTRY_COMPARE(sourceSpy.count(), 1);
     QTRY_COMPARE(progressSpy.count(), 0);
     QTRY_COMPARE(statusSpy.count(), 1);
 
     // Loading remote file
     ctxt->setContextProperty("srcImage", server.url("/rect.png"));
-    QTRY_VERIFY(obj->status() == QQuickImage::Loading);
-    QTRY_VERIFY(obj->progress() == 0.0);
-    QTRY_VERIFY(obj->status() == QQuickImage::Ready);
-    QTRY_VERIFY(obj->progress() == 1.0);
+    QTRY_COMPARE(obj->status(), QQuickImage::Loading);
+    QTRY_COMPARE(obj->progress(), 0.0);
+    QTRY_COMPARE(obj->status(), QQuickImage::Ready);
+    QTRY_COMPARE(obj->progress(), 1.0);
     QTRY_COMPARE(sourceSpy.count(), 2);
     QTRY_VERIFY(progressSpy.count() >= 2);
     QTRY_COMPARE(statusSpy.count(), 3);
@@ -573,8 +573,8 @@ void tst_qquickimage::noLoading()
     progressSpy.clear();
     ctxt->setContextProperty("srcImage", testFileUrl("green.png"));
     ctxt->setContextProperty("srcImage", server.url("/rect.png"));
-    QTRY_VERIFY(obj->status() == QQuickImage::Ready);
-    QTRY_VERIFY(obj->progress() == 1.0);
+    QTRY_COMPARE(obj->status(), QQuickImage::Ready);
+    QTRY_COMPARE(obj->progress(), 1.0);
     QTRY_COMPARE(sourceSpy.count(), 4);
     QTRY_COMPARE(progressSpy.count(), 0);
     QTRY_COMPARE(statusSpy.count(), 5);
@@ -628,7 +628,7 @@ void tst_qquickimage::sourceSize_QTBUG_14303()
     QSignalSpy sourceSizeSpy(obj, SIGNAL(sourceSizeChanged()));
 
     QTRY_VERIFY(obj != 0);
-    QTRY_VERIFY(obj->status() == QQuickImage::Ready);
+    QTRY_COMPARE(obj->status(), QQuickImage::Ready);
 
     QTRY_COMPARE(obj->sourceSize().width(), 200);
     QTRY_COMPARE(obj->sourceSize().height(), 200);
@@ -844,8 +844,8 @@ void tst_qquickimage::progressAndStatusChanges()
     component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
     QQuickImage *obj = qobject_cast<QQuickImage*>(component.create());
     QVERIFY(obj != 0);
-    QVERIFY(obj->status() == QQuickImage::Ready);
-    QTRY_VERIFY(obj->progress() == 1.0);
+    QCOMPARE(obj->status(), QQuickImage::Ready);
+    QTRY_COMPARE(obj->progress(), 1.0);
 
     qRegisterMetaType<QQuickImageBase::Status>();
     QSignalSpy sourceSpy(obj, SIGNAL(sourceChanged(QUrl)));
@@ -854,33 +854,33 @@ void tst_qquickimage::progressAndStatusChanges()
 
     // Same image
     ctxt->setContextProperty("srcImage", testFileUrl("heart.png"));
-    QTRY_VERIFY(obj->status() == QQuickImage::Ready);
-    QTRY_VERIFY(obj->progress() == 1.0);
+    QTRY_COMPARE(obj->status(), QQuickImage::Ready);
+    QTRY_COMPARE(obj->progress(), 1.0);
     QTRY_COMPARE(sourceSpy.count(), 0);
     QTRY_COMPARE(progressSpy.count(), 0);
     QTRY_COMPARE(statusSpy.count(), 0);
 
     // Loading local file
     ctxt->setContextProperty("srcImage", testFileUrl("colors.png"));
-    QTRY_VERIFY(obj->status() == QQuickImage::Ready);
-    QTRY_VERIFY(obj->progress() == 1.0);
+    QTRY_COMPARE(obj->status(), QQuickImage::Ready);
+    QTRY_COMPARE(obj->progress(), 1.0);
     QTRY_COMPARE(sourceSpy.count(), 1);
     QTRY_COMPARE(progressSpy.count(), 0);
     QTRY_COMPARE(statusSpy.count(), 1);
 
     // Loading remote file
     ctxt->setContextProperty("srcImage", server.url("/heart.png"));
-    QTRY_VERIFY(obj->status() == QQuickImage::Loading);
-    QTRY_VERIFY(obj->progress() == 0.0);
-    QTRY_VERIFY(obj->status() == QQuickImage::Ready);
-    QTRY_VERIFY(obj->progress() == 1.0);
+    QTRY_COMPARE(obj->status(), QQuickImage::Loading);
+    QTRY_COMPARE(obj->progress(), 0.0);
+    QTRY_COMPARE(obj->status(), QQuickImage::Ready);
+    QTRY_COMPARE(obj->progress(), 1.0);
     QTRY_COMPARE(sourceSpy.count(), 2);
     QTRY_VERIFY(progressSpy.count() > 1);
     QTRY_COMPARE(statusSpy.count(), 3);
 
     ctxt->setContextProperty("srcImage", "");
-    QTRY_VERIFY(obj->status() == QQuickImage::Null);
-    QTRY_VERIFY(obj->progress() == 0.0);
+    QTRY_COMPARE(obj->status(), QQuickImage::Null);
+    QTRY_COMPARE(obj->progress(), 0.0);
     QTRY_COMPARE(sourceSpy.count(), 3);
     QTRY_VERIFY(progressSpy.count() > 2);
     QTRY_COMPARE(statusSpy.count(), 4);
diff --git a/tests/auto/quick/qquickimageprovider/tst_qquickimageprovider.cpp b/tests/auto/quick/qquickimageprovider/tst_qquickimageprovider.cpp
index 80406be753..644f2be129 100644
--- a/tests/auto/quick/qquickimageprovider/tst_qquickimageprovider.cpp
+++ b/tests/auto/quick/qquickimageprovider/tst_qquickimageprovider.cpp
@@ -237,15 +237,15 @@ void tst_qquickimageprovider::runTest(bool async, QQuickImageProvider *provider)
         async |= (provider->flags() & QQuickImageProvider::ForceAsynchronousImageLoading) != 0;
 
     if (async)
-        QTRY_VERIFY(obj->status() == QQuickImage::Loading);
+        QTRY_COMPARE(obj->status(), QQuickImage::Loading);
 
     QCOMPARE(obj->source(), QUrl(source));
 
     if (error.isEmpty()) {
         if (async)
-            QTRY_VERIFY(obj->status() == QQuickImage::Ready);
+            QTRY_COMPARE(obj->status(), QQuickImage::Ready);
         else
-            QVERIFY(obj->status() == QQuickImage::Ready);
+            QCOMPARE(obj->status(), QQuickImage::Ready);
         if (QByteArray(QTest::currentDataTag()).startsWith("qimage"))
             QCOMPARE(static_cast<TestQImageProvider*>(provider)->lastImageId, imageId);
         else
@@ -257,9 +257,9 @@ void tst_qquickimageprovider::runTest(bool async, QQuickImageProvider *provider)
         QCOMPARE(obj->progress(), 1.0);
     } else {
         if (async)
-            QTRY_VERIFY(obj->status() == QQuickImage::Error);
+            QTRY_COMPARE(obj->status(), QQuickImage::Error);
         else
-            QVERIFY(obj->status() == QQuickImage::Error);
+            QCOMPARE(obj->status(), QQuickImage::Error);
     }
 
     delete obj;
@@ -456,7 +456,7 @@ void tst_qquickimageprovider::threadTest()
     provider->cond.wakeAll();
     QTest::qWait(250);
     foreach (QQuickImage *img, images) {
-        QTRY_VERIFY(img->status() == QQuickImage::Ready);
+        QTRY_COMPARE(img->status(), QQuickImage::Ready);
     }
 }
 
@@ -544,14 +544,14 @@ void tst_qquickimageprovider::asyncTextureTest()
     QList<QQuickImage *> images = obj->findChildren<QQuickImage *>();
     QCOMPARE(images.count(), 4);
 
-    QTRY_VERIFY(provider->pool.activeThreadCount() == 4);
+    QTRY_COMPARE(provider->pool.activeThreadCount(), 4);
     foreach (QQuickImage *img, images) {
-        QTRY_VERIFY(img->status() == QQuickImage::Loading);
+        QTRY_COMPARE(img->status(), QQuickImage::Loading);
     }
     provider->ok = true;
     provider->condition.wakeAll();
     foreach (QQuickImage *img, images) {
-        QTRY_VERIFY(img->status() == QQuickImage::Ready);
+        QTRY_COMPARE(img->status(), QQuickImage::Ready);
     }
 }
 
diff --git a/tests/auto/quick/qquickitem/tst_qquickitem.cpp b/tests/auto/quick/qquickitem/tst_qquickitem.cpp
index c79af91747..73e691b08c 100644
--- a/tests/auto/quick/qquickitem/tst_qquickitem.cpp
+++ b/tests/auto/quick/qquickitem/tst_qquickitem.cpp
@@ -276,7 +276,7 @@ void tst_qquickitem::simpleFocus()
     QQuickWindow window;
     ensureFocus(&window);
 
-    QTRY_VERIFY(QGuiApplication::focusWindow() == &window);
+    QTRY_COMPARE(QGuiApplication::focusWindow(), &window);
 
     QQuickItem *l1c1 = new TestItem(window.contentItem());
     QQuickItem *l1c2 = new TestItem(window.contentItem());
@@ -327,7 +327,7 @@ void tst_qquickitem::scopedFocus()
 {
     QQuickWindow window;
     ensureFocus(&window);
-    QTRY_VERIFY(QGuiApplication::focusWindow() == &window);
+    QTRY_COMPARE(QGuiApplication::focusWindow(), &window);
 
     QQuickItem *l1c1 = new TestItem(window.contentItem());
     QQuickItem *l1c2 = new TestItem(window.contentItem());
@@ -407,7 +407,7 @@ void tst_qquickitem::addedToWindow()
     {
     QQuickWindow window;
     ensureFocus(&window);
-    QTRY_VERIFY(QGuiApplication::focusWindow() == &window);
+    QTRY_COMPARE(QGuiApplication::focusWindow(), &window);
 
     QQuickItem *item = new TestItem;
 
@@ -427,7 +427,7 @@ void tst_qquickitem::addedToWindow()
     {
     QQuickWindow window;
     ensureFocus(&window);
-    QTRY_VERIFY(QGuiApplication::focusWindow() == &window);
+    QTRY_COMPARE(QGuiApplication::focusWindow(), &window);
 
     QQuickItem *item = new TestItem(window.contentItem());
 
@@ -456,7 +456,7 @@ void tst_qquickitem::addedToWindow()
     {
     QQuickWindow window;
     ensureFocus(&window);
-    QTRY_VERIFY(QGuiApplication::focusWindow() == &window);
+    QTRY_COMPARE(QGuiApplication::focusWindow(), &window);
 
     QQuickItem *tree = new TestItem;
     QQuickItem *c1 = new TestItem(tree);
@@ -480,7 +480,7 @@ void tst_qquickitem::addedToWindow()
     {
     QQuickWindow window;
     ensureFocus(&window);
-    QTRY_VERIFY(QGuiApplication::focusWindow() == &window);
+    QTRY_COMPARE(QGuiApplication::focusWindow(), &window);
     QQuickItem *tree = new TestFocusScope;
     QQuickItem *c1 = new TestItem(tree);
     QQuickItem *c2 = new TestItem(tree);
@@ -508,7 +508,7 @@ void tst_qquickitem::addedToWindow()
     {
     QQuickWindow window;
     ensureFocus(&window);
-    QTRY_VERIFY(QGuiApplication::focusWindow() == &window);
+    QTRY_COMPARE(QGuiApplication::focusWindow(), &window);
     QQuickItem *tree = new TestFocusScope;
     QQuickItem *c1 = new TestItem(tree);
     QQuickItem *c2 = new TestItem(tree);
@@ -534,7 +534,7 @@ void tst_qquickitem::addedToWindow()
     {
     QQuickWindow window;
     ensureFocus(&window);
-    QTRY_VERIFY(QGuiApplication::focusWindow() == &window);
+    QTRY_COMPARE(QGuiApplication::focusWindow(), &window);
     QQuickItem *child = new TestItem(window.contentItem());
     QQuickItem *tree = new TestFocusScope;
     QQuickItem *c1 = new TestItem(tree);
@@ -574,7 +574,7 @@ void tst_qquickitem::changeParent()
     {
     QQuickWindow window;
     ensureFocus(&window);
-    QTRY_VERIFY(QGuiApplication::focusWindow() == &window);
+    QTRY_COMPARE(QGuiApplication::focusWindow(), &window);
     QQuickItem *child = new TestItem(window.contentItem());
 
     FocusState focusState;
@@ -596,7 +596,7 @@ void tst_qquickitem::changeParent()
     {
     QQuickWindow window;
     ensureFocus(&window);
-    QTRY_VERIFY(QGuiApplication::focusWindow() == &window);
+    QTRY_COMPARE(QGuiApplication::focusWindow(), &window);
     QQuickItem *child = new TestItem(window.contentItem());
     QQuickItem *child2 = new TestItem(window.contentItem());
 
@@ -617,7 +617,7 @@ void tst_qquickitem::changeParent()
     {
     QQuickWindow window;
     ensureFocus(&window);
-    QTRY_VERIFY(QGuiApplication::focusWindow() == &window);
+    QTRY_COMPARE(QGuiApplication::focusWindow(), &window);
     QQuickItem *child = new TestItem(window.contentItem());
     QQuickItem *child2 = new TestFocusScope(window.contentItem());
     QQuickItem *item = new TestItem(child);
@@ -639,7 +639,7 @@ void tst_qquickitem::changeParent()
     {
     QQuickWindow window;
     ensureFocus(&window);
-    QTRY_VERIFY(QGuiApplication::focusWindow() == &window);
+    QTRY_COMPARE(QGuiApplication::focusWindow(), &window);
     QQuickItem *child = new TestItem(window.contentItem());
     QQuickItem *child2 = new TestFocusScope(window.contentItem());
     QQuickItem *item = new TestItem(child2);
@@ -661,7 +661,7 @@ void tst_qquickitem::changeParent()
     {
     QQuickWindow window;
     ensureFocus(&window);
-    QTRY_VERIFY(QGuiApplication::focusWindow() == &window);
+    QTRY_COMPARE(QGuiApplication::focusWindow(), &window);
     QQuickItem *child = new TestItem(window.contentItem());
     QQuickItem *child2 = new TestFocusScope(window.contentItem());
     QQuickItem *item = new TestItem(child2);
@@ -687,7 +687,7 @@ void tst_qquickitem::changeParent()
     {
     QQuickWindow window;
     ensureFocus(&window);
-    QTRY_VERIFY(QGuiApplication::focusWindow() == &window);
+    QTRY_COMPARE(QGuiApplication::focusWindow(), &window);
     QQuickItem *item = new TestFocusScope(window.contentItem());
     QQuickItem *child = new TestItem(item);
     QQuickItem *child2 = new TestItem;
@@ -726,7 +726,7 @@ void tst_qquickitem::multipleFocusClears()
     view.setSource(testFileUrl("multipleFocusClears.qml"));
     view.show();
     ensureFocus(&view);
-    QTRY_VERIFY(QGuiApplication::focusWindow() == &view);
+    QTRY_COMPARE(QGuiApplication::focusWindow(), &view);
 }
 
 void tst_qquickitem::focusSubItemInNonFocusScope()
@@ -757,7 +757,7 @@ void tst_qquickitem::parentItemWithFocus()
 {
     QQuickWindow window;
     ensureFocus(&window);
-    QTRY_VERIFY(QGuiApplication::focusWindow() == &window);
+    QTRY_COMPARE(QGuiApplication::focusWindow(), &window);
     {
     QQuickItem parent;
     QQuickItem child;
@@ -856,7 +856,7 @@ void tst_qquickitem::reparentFocusedItem()
 {
     QQuickWindow window;
     ensureFocus(&window);
-    QTRY_VERIFY(QGuiApplication::focusWindow() == &window);
+    QTRY_COMPARE(QGuiApplication::focusWindow(), &window);
 
     QQuickItem parent(window.contentItem());
     QQuickItem child(&parent);
@@ -883,18 +883,18 @@ void tst_qquickitem::reparentFocusedItem()
 void tst_qquickitem::constructor()
 {
     QScopedPointer<QQuickItem> root(new QQuickItem);
-    QVERIFY(root->parent() == 0);
-    QVERIFY(root->parentItem() == 0);
+    QVERIFY(!root->parent());
+    QVERIFY(!root->parentItem());
 
     QQuickItem *child1 = new QQuickItem(root.data());
-    QVERIFY(child1->parent() == root.data());
-    QVERIFY(child1->parentItem() == root.data());
+    QCOMPARE(child1->parent(), root.data());
+    QCOMPARE(child1->parentItem(), root.data());
     QCOMPARE(root->childItems().count(), 1);
     QCOMPARE(root->childItems().at(0), child1);
 
     QQuickItem *child2 = new QQuickItem(root.data());
-    QVERIFY(child2->parent() == root.data());
-    QVERIFY(child2->parentItem() == root.data());
+    QCOMPARE(child2->parent(), root.data());
+    QCOMPARE(child2->parentItem(), root.data());
     QCOMPARE(root->childItems().count(), 2);
     QCOMPARE(root->childItems().at(0), child1);
     QCOMPARE(root->childItems().at(1), child2);
@@ -903,41 +903,41 @@ void tst_qquickitem::constructor()
 void tst_qquickitem::setParentItem()
 {
     QQuickItem *root = new QQuickItem;
-    QVERIFY(root->parent() == 0);
-    QVERIFY(root->parentItem() == 0);
+    QVERIFY(!root->parent());
+    QVERIFY(!root->parentItem());
 
     QQuickItem *child1 = new QQuickItem;
-    QVERIFY(child1->parent() == 0);
-    QVERIFY(child1->parentItem() == 0);
+    QVERIFY(!child1->parent());
+    QVERIFY(!child1->parentItem());
 
     child1->setParentItem(root);
-    QVERIFY(child1->parent() == 0);
-    QVERIFY(child1->parentItem() == root);
+    QVERIFY(!child1->parent());
+    QCOMPARE(child1->parentItem(), root);
     QCOMPARE(root->childItems().count(), 1);
     QCOMPARE(root->childItems().at(0), child1);
 
     QQuickItem *child2 = new QQuickItem;
-    QVERIFY(child2->parent() == 0);
-    QVERIFY(child2->parentItem() == 0);
+    QVERIFY(!child2->parent());
+    QVERIFY(!child2->parentItem());
     child2->setParentItem(root);
-    QVERIFY(child2->parent() == 0);
-    QVERIFY(child2->parentItem() == root);
+    QVERIFY(!child2->parent());
+    QCOMPARE(child2->parentItem(), root);
     QCOMPARE(root->childItems().count(), 2);
     QCOMPARE(root->childItems().at(0), child1);
     QCOMPARE(root->childItems().at(1), child2);
 
     child1->setParentItem(0);
-    QVERIFY(child1->parent() == 0);
-    QVERIFY(child1->parentItem() == 0);
+    QVERIFY(!child1->parent());
+    QVERIFY(!child1->parentItem());
     QCOMPARE(root->childItems().count(), 1);
     QCOMPARE(root->childItems().at(0), child2);
 
     delete root;
 
-    QVERIFY(child1->parent() == 0);
-    QVERIFY(child1->parentItem() == 0);
-    QVERIFY(child2->parent() == 0);
-    QVERIFY(child2->parentItem() == 0);
+    QVERIFY(!child1->parent());
+    QVERIFY(!child1->parentItem());
+    QVERIFY(!child2->parent());
+    QVERIFY(!child2->parentItem());
 
     delete child1;
     delete child2;
diff --git a/tests/auto/quick/qquickitem2/tst_qquickitem.cpp b/tests/auto/quick/qquickitem2/tst_qquickitem.cpp
index a083b8e70d..396f183860 100644
--- a/tests/auto/quick/qquickitem2/tst_qquickitem.cpp
+++ b/tests/auto/quick/qquickitem2/tst_qquickitem.cpp
@@ -319,7 +319,7 @@ void tst_QQuickItem::activeFocusOnTab()
     window->show();
     window->requestActivate();
     QVERIFY(QTest::qWaitForWindowActive(window));
-    QVERIFY(QGuiApplication::focusWindow() == window);
+    QCOMPARE(QGuiApplication::focusWindow(), window);
 
     // original: button12
     QQuickItem *item = findItem<QQuickItem>(window->rootObject(), "button12");
@@ -431,7 +431,7 @@ void tst_QQuickItem::activeFocusOnTab2()
     window->show();
     window->requestActivate();
     QVERIFY(QTest::qWaitForWindowActive(window));
-    QVERIFY(QGuiApplication::focusWindow() == window);
+    QCOMPARE(QGuiApplication::focusWindow(), window);
 
     // original: button12
     QQuickItem *item = findItem<QQuickItem>(window->rootObject(), "button12");
@@ -471,7 +471,7 @@ void tst_QQuickItem::activeFocusOnTab3()
     window->show();
     window->requestActivate();
     QVERIFY(QTest::qWaitForWindowActive(window));
-    QVERIFY(QGuiApplication::focusWindow() == window);
+    QCOMPARE(QGuiApplication::focusWindow(), window);
 
     // original: button1
     QQuickItem *item = findItem<QQuickItem>(window->rootObject(), "button1");
@@ -653,7 +653,7 @@ void tst_QQuickItem::activeFocusOnTab4()
     window->show();
     window->requestActivate();
     QVERIFY(QTest::qWaitForWindowActive(window));
-    QVERIFY(QGuiApplication::focusWindow() == window);
+    QCOMPARE(QGuiApplication::focusWindow(), window);
 
     // original: button11
     QQuickItem *item = findItem<QQuickItem>(window->rootObject(), "button11");
@@ -685,7 +685,7 @@ void tst_QQuickItem::activeFocusOnTab5()
     window->show();
     window->requestActivate();
     QVERIFY(QTest::qWaitForWindowActive(window));
-    QVERIFY(QGuiApplication::focusWindow() == window);
+    QCOMPARE(QGuiApplication::focusWindow(), window);
 
     // original: button11 in sub1
     QQuickItem *item = findItem<QQuickItem>(window->rootObject(), "button11");
@@ -719,7 +719,7 @@ void tst_QQuickItem::activeFocusOnTab6()
     window->show();
     window->requestActivate();
     QVERIFY(QTest::qWaitForWindowActive(window));
-    QVERIFY(QGuiApplication::focusWindow() == window);
+    QCOMPARE(QGuiApplication::focusWindow(), window);
 
     // original: button12
     QQuickItem *item = findItem<QQuickItem>(window->rootObject(), "button12");
@@ -777,7 +777,7 @@ void tst_QQuickItem::activeFocusOnTab7()
     window->show();
     window->requestActivate();
     QVERIFY(QTest::qWaitForWindowActive(window));
-    QVERIFY(QGuiApplication::focusWindow() == window);
+    QCOMPARE(QGuiApplication::focusWindow(), window);
 
     QQuickItem *item = findItem<QQuickItem>(window->rootObject(), "button1");
     QVERIFY(item);
@@ -810,7 +810,7 @@ void tst_QQuickItem::activeFocusOnTab8()
     window->show();
     window->requestActivate();
     QVERIFY(QTest::qWaitForWindowActive(window));
-    QVERIFY(QGuiApplication::focusWindow() == window);
+    QCOMPARE(QGuiApplication::focusWindow(), window);
 
     QQuickItem *content = window->contentItem();
     QVERIFY(content);
@@ -862,7 +862,7 @@ void tst_QQuickItem::activeFocusOnTab9()
     window->show();
     window->requestActivate();
     QVERIFY(QTest::qWaitForWindowActive(window));
-    QVERIFY(QGuiApplication::focusWindow() == window);
+    QCOMPARE(QGuiApplication::focusWindow(), window);
 
     QQuickItem *content = window->contentItem();
     QVERIFY(content);
@@ -913,7 +913,7 @@ void tst_QQuickItem::activeFocusOnTab10()
     window->show();
     window->requestActivate();
     QVERIFY(QTest::qWaitForWindowActive(window));
-    QVERIFY(QGuiApplication::focusWindow() == window);
+    QCOMPARE(QGuiApplication::focusWindow(), window);
 
     QQuickItem *content = window->contentItem();
     QVERIFY(content);
@@ -996,7 +996,7 @@ void tst_QQuickItem::nextItemInFocusChain()
     window->show();
     window->requestActivate();
     QVERIFY(QTest::qWaitForWindowActive(window));
-    QVERIFY(QGuiApplication::focusWindow() == window);
+    QCOMPARE(QGuiApplication::focusWindow(), window);
 
     QQuickItem *button11 = findItem<QQuickItem>(window->rootObject(), "button11");
     QVERIFY(button11);
@@ -1072,7 +1072,7 @@ void tst_QQuickItem::nextItemInFocusChain2()
     window->show();
     window->requestActivate();
     QVERIFY(QTest::qWaitForWindowActive(window));
-    QVERIFY(QGuiApplication::focusWindow() == window);
+    QCOMPARE(QGuiApplication::focusWindow(), window);
 
     QQuickItem *button11 = findItem<QQuickItem>(window->rootObject(), "button11");
     QVERIFY(button11);
@@ -1117,7 +1117,7 @@ void tst_QQuickItem::nextItemInFocusChain3()
     window->show();
     window->requestActivate();
     QVERIFY(QTest::qWaitForWindowActive(window));
-    QVERIFY(QGuiApplication::focusWindow() == window);
+    QCOMPARE(QGuiApplication::focusWindow(), window);
 }
 
 void tst_QQuickItem::keys()
@@ -1135,7 +1135,7 @@ void tst_QQuickItem::keys()
     window->show();
     window->requestActivate();
     QVERIFY(QTest::qWaitForWindowActive(window));
-    QVERIFY(QGuiApplication::focusWindow() == window);
+    QCOMPARE(QGuiApplication::focusWindow(), window);
 
     QVERIFY(window->rootObject());
     QCOMPARE(window->rootObject()->property("isEnabled").toBool(), true);
@@ -1145,7 +1145,7 @@ void tst_QQuickItem::keys()
     QCOMPARE(testObject->mKey, int(Qt::Key_A));
     QCOMPARE(testObject->mForwardedKey, int(Qt::Key_A));
     QCOMPARE(testObject->mText, QLatin1String("A"));
-    QVERIFY(testObject->mModifiers == Qt::NoModifier);
+    QCOMPARE(testObject->mModifiers, int(Qt::NoModifier));
     QVERIFY(!key.isAccepted());
 
     testObject->reset();
@@ -1155,7 +1155,7 @@ void tst_QQuickItem::keys()
     QCOMPARE(testObject->mKey, int(Qt::Key_A));
     QCOMPARE(testObject->mForwardedKey, int(Qt::Key_A));
     QCOMPARE(testObject->mText, QLatin1String("A"));
-    QVERIFY(testObject->mModifiers == Qt::ShiftModifier);
+    QCOMPARE(testObject->mModifiers, int(Qt::ShiftModifier));
     QVERIFY(key.isAccepted());
 
     testObject->reset();
@@ -1165,7 +1165,7 @@ void tst_QQuickItem::keys()
     QCOMPARE(testObject->mKey, int(Qt::Key_Return));
     QCOMPARE(testObject->mForwardedKey, int(Qt::Key_Return));
     QCOMPARE(testObject->mText, QLatin1String("Return"));
-    QVERIFY(testObject->mModifiers == Qt::NoModifier);
+    QCOMPARE(testObject->mModifiers, int(Qt::NoModifier));
     QVERIFY(key.isAccepted());
 
     testObject->reset();
@@ -1175,7 +1175,7 @@ void tst_QQuickItem::keys()
     QCOMPARE(testObject->mKey, int(Qt::Key_0));
     QCOMPARE(testObject->mForwardedKey, int(Qt::Key_0));
     QCOMPARE(testObject->mText, QLatin1String("0"));
-    QVERIFY(testObject->mModifiers == Qt::NoModifier);
+    QCOMPARE(testObject->mModifiers, int(Qt::NoModifier));
     QVERIFY(key.isAccepted());
 
     testObject->reset();
@@ -1185,7 +1185,7 @@ void tst_QQuickItem::keys()
     QCOMPARE(testObject->mKey, int(Qt::Key_9));
     QCOMPARE(testObject->mForwardedKey, int(Qt::Key_9));
     QCOMPARE(testObject->mText, QLatin1String("9"));
-    QVERIFY(testObject->mModifiers == Qt::NoModifier);
+    QCOMPARE(testObject->mModifiers, int(Qt::NoModifier));
     QVERIFY(!key.isAccepted());
 
     testObject->reset();
@@ -1195,7 +1195,7 @@ void tst_QQuickItem::keys()
     QCOMPARE(testObject->mKey, int(Qt::Key_Tab));
     QCOMPARE(testObject->mForwardedKey, int(Qt::Key_Tab));
     QCOMPARE(testObject->mText, QLatin1String("Tab"));
-    QVERIFY(testObject->mModifiers == Qt::NoModifier);
+    QCOMPARE(testObject->mModifiers, int(Qt::NoModifier));
     QVERIFY(key.isAccepted());
 
     testObject->reset();
@@ -1205,7 +1205,7 @@ void tst_QQuickItem::keys()
     QCOMPARE(testObject->mKey, int(Qt::Key_Backtab));
     QCOMPARE(testObject->mForwardedKey, int(Qt::Key_Backtab));
     QCOMPARE(testObject->mText, QLatin1String("Backtab"));
-    QVERIFY(testObject->mModifiers == Qt::NoModifier);
+    QCOMPARE(testObject->mModifiers, int(Qt::NoModifier));
     QVERIFY(key.isAccepted());
 
     testObject->reset();
@@ -1214,8 +1214,8 @@ void tst_QQuickItem::keys()
     QGuiApplication::sendEvent(window, &key);
     QCOMPARE(testObject->mKey, int(Qt::Key_VolumeUp));
     QCOMPARE(testObject->mForwardedKey, int(Qt::Key_VolumeUp));
-    QVERIFY(testObject->mModifiers == Qt::NoModifier);
-    QVERIFY(testObject->mNativeScanCode == 1234);
+    QCOMPARE(testObject->mModifiers, int(Qt::NoModifier));
+    QCOMPARE(testObject->mNativeScanCode, quint32(1234));
     QVERIFY(key.isAccepted());
 
     testObject->reset();
@@ -1226,7 +1226,7 @@ void tst_QQuickItem::keys()
     QCOMPARE(testObject->mKey, int(Qt::Key_A));
     QCOMPARE(testObject->mForwardedKey, 0);
     QCOMPARE(testObject->mText, QLatin1String("A"));
-    QVERIFY(testObject->mModifiers == Qt::NoModifier);
+    QCOMPARE(testObject->mModifiers, int(Qt::NoModifier));
     QVERIFY(!key.isAccepted());
 
     testObject->reset();
@@ -1321,7 +1321,7 @@ void tst_QQuickItem::keysProcessingOrder()
     window->show();
     window->requestActivate();
     QVERIFY(QTest::qWaitForWindowActive(window));
-    QVERIFY(QGuiApplication::focusWindow() == window);
+    QCOMPARE(QGuiApplication::focusWindow(), window);
 
     KeyTestItem *testItem = qobject_cast<KeyTestItem*>(window->rootObject());
     QVERIFY(testItem);
@@ -1332,7 +1332,7 @@ void tst_QQuickItem::keysProcessingOrder()
     QGuiApplication::sendEvent(window, &key);
     QCOMPARE(testObject->mKey, int(Qt::Key_A));
     QCOMPARE(testObject->mText, QLatin1String("A"));
-    QVERIFY(testObject->mModifiers == Qt::NoModifier);
+    QCOMPARE(testObject->mModifiers, int(Qt::NoModifier));
     QVERIFY(key.isAccepted());
 
     testObject->reset();
@@ -1352,7 +1352,7 @@ void tst_QQuickItem::keysProcessingOrder()
     QGuiApplication::sendEvent(window, &key);
     QCOMPARE(testObject->mKey, int(Qt::Key_B));
     QCOMPARE(testObject->mText, QLatin1String("B"));
-    QVERIFY(testObject->mModifiers == Qt::NoModifier);
+    QCOMPARE(testObject->mModifiers, int(Qt::NoModifier));
     QVERIFY(!key.isAccepted());
 
     testObject->reset();
@@ -1379,7 +1379,7 @@ void tst_QQuickItem::keysim()
     window->show();
     window->requestActivate();
     QVERIFY(QTest::qWaitForWindowActive(window));
-    QVERIFY(QGuiApplication::focusWindow() == window);
+    QCOMPARE(QGuiApplication::focusWindow(), window);
 
     QVERIFY(window->rootObject());
     QVERIFY(window->rootObject()->hasFocus() && window->rootObject()->hasActiveFocus());
@@ -1405,7 +1405,7 @@ void tst_QQuickItem::keysForward()
     window.show();
     window.requestActivate();
     QVERIFY(QTest::qWaitForWindowActive(&window));
-    QVERIFY(QGuiApplication::focusWindow() == &window);
+    QCOMPARE(QGuiApplication::focusWindow(), &window);
 
     QQuickItem *rootItem = qobject_cast<QQuickItem *>(window.rootObject());
     QVERIFY(rootItem);
@@ -1645,7 +1645,7 @@ void tst_QQuickItem::keyNavigation()
     window->show();
     window->requestActivate();
     QVERIFY(QTest::qWaitForWindowActive(window));
-    QVERIFY(QGuiApplication::focusWindow() == window);
+    QCOMPARE(QGuiApplication::focusWindow(), window);
 
     QQuickItem *item = findItem<QQuickItem>(window->rootObject(), "item1");
     QVERIFY(item);
@@ -1722,7 +1722,7 @@ void tst_QQuickItem::keyNavigation_RightToLeft()
     window->show();
     window->requestActivate();
     QVERIFY(QTest::qWaitForWindowActive(window));
-    QVERIFY(QGuiApplication::focusWindow() == window);
+    QCOMPARE(QGuiApplication::focusWindow(), window);
 
     QQuickItem *rootItem = qobject_cast<QQuickItem*>(window->rootObject());
     QVERIFY(rootItem);
@@ -1777,7 +1777,7 @@ void tst_QQuickItem::keyNavigation_skipNotVisible()
     window->show();
     window->requestActivate();
     QVERIFY(QTest::qWaitForWindowActive(window));
-    QVERIFY(QGuiApplication::focusWindow() == window);
+    QCOMPARE(QGuiApplication::focusWindow(), window);
 
     QQuickItem *item = findItem<QQuickItem>(window->rootObject(), "item1");
     QVERIFY(item);
@@ -1852,7 +1852,7 @@ void tst_QQuickItem::keyNavigation_implicitSetting()
     window->show();
     window->requestActivate();
     QVERIFY(QTest::qWaitForWindowActive(window));
-    QVERIFY(QGuiApplication::focusWindow() == window);
+    QCOMPARE(QGuiApplication::focusWindow(), window);
 
     QEvent wa(QEvent::WindowActivate);
     QGuiApplication::sendEvent(window, &wa);
@@ -1982,7 +1982,7 @@ void tst_QQuickItem::keyNavigation_focusReason()
     window->requestActivate();
 
     QVERIFY(QTest::qWaitForWindowActive(window));
-    QVERIFY(QGuiApplication::focusWindow() == window);
+    QCOMPARE(QGuiApplication::focusWindow(), window);
 
     // install event filter on first item
     QQuickItem *item = findItem<QQuickItem>(window->rootObject(), "item1");
@@ -2040,7 +2040,7 @@ void tst_QQuickItem::smooth()
     QVERIFY(item->smooth());
     QCOMPARE(spy.count(),1);
     QList<QVariant> arguments = spy.first();
-    QVERIFY(arguments.count() == 1);
+    QCOMPARE(arguments.count(), 1);
     QVERIFY(arguments.at(0).toBool());
 
     item->setSmooth(true);
@@ -2069,7 +2069,7 @@ void tst_QQuickItem::antialiasing()
     QVERIFY(item->antialiasing());
     QCOMPARE(spy.count(),1);
     QList<QVariant> arguments = spy.first();
-    QVERIFY(arguments.count() == 1);
+    QCOMPARE(arguments.count(), 1);
     QVERIFY(arguments.at(0).toBool());
 
     item->setAntialiasing(true);
@@ -2098,7 +2098,7 @@ void tst_QQuickItem::clip()
     QVERIFY(item->clip());
 
     QList<QVariant> arguments = spy.first();
-    QVERIFY(arguments.count() == 1);
+    QCOMPARE(arguments.count(), 1);
     QVERIFY(arguments.at(0).toBool());
 
     QCOMPARE(spy.count(),1);
@@ -2325,7 +2325,7 @@ void tst_QQuickItem::propertyChanges()
     window->show();
     window->requestActivate();
     QVERIFY(QTest::qWaitForWindowActive(window));
-    QVERIFY(QGuiApplication::focusWindow() == window);
+    QCOMPARE(QGuiApplication::focusWindow(), window);
 
     QQuickItem *item = findItem<QQuickItem>(window->rootObject(), "item");
     QQuickItem *parentItem = findItem<QQuickItem>(window->rootObject(), "parentItem");
@@ -2353,7 +2353,7 @@ void tst_QQuickItem::propertyChanges()
     QCOMPARE(item->parentItem(), parentItem);
     QCOMPARE(parentSpy.count(),1);
     QList<QVariant> parentArguments = parentSpy.first();
-    QVERIFY(parentArguments.count() == 1);
+    QCOMPARE(parentArguments.count(), 1);
     QCOMPARE(item->parentItem(), qvariant_cast<QQuickItem *>(parentArguments.at(0)));
     QCOMPARE(childrenChangedSpy.count(),1);
 
@@ -2369,19 +2369,19 @@ void tst_QQuickItem::propertyChanges()
     QCOMPARE(item->baselineOffset(), 10.0);
     QCOMPARE(baselineOffsetSpy.count(),1);
     QList<QVariant> baselineOffsetArguments = baselineOffsetSpy.first();
-    QVERIFY(baselineOffsetArguments.count() == 1);
+    QCOMPARE(baselineOffsetArguments.count(), 1);
     QCOMPARE(item->baselineOffset(), baselineOffsetArguments.at(0).toReal());
 
     QCOMPARE(parentItem->childrenRect(), QRectF(0.0,0.0,100.0,200.0));
     QCOMPARE(childrenRectSpy.count(),1);
     QList<QVariant> childrenRectArguments = childrenRectSpy.at(0);
-    QVERIFY(childrenRectArguments.count() == 1);
+    QCOMPARE(childrenRectArguments.count(), 1);
     QCOMPARE(parentItem->childrenRect(), childrenRectArguments.at(0).toRectF());
 
     QCOMPARE(item->hasActiveFocus(), true);
     QCOMPARE(focusSpy.count(),1);
     QList<QVariant> focusArguments = focusSpy.first();
-    QVERIFY(focusArguments.count() == 1);
+    QCOMPARE(focusArguments.count(), 1);
     QCOMPARE(focusArguments.at(0).toBool(), true);
 
     QCOMPARE(parentItem->hasActiveFocus(), false);
@@ -2737,7 +2737,7 @@ void tst_QQuickItem::contains()
     window->show();
     window->requestActivate();
     QVERIFY(QTest::qWaitForWindowActive(window));
-    QVERIFY(QGuiApplication::focusWindow() == window);
+    QCOMPARE(QGuiApplication::focusWindow(), window);
 
     QQuickItem *root = qobject_cast<QQuickItem *>(window->rootObject());
     QVERIFY(root);
diff --git a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
index cb5f2e8e6c..472ffdc4b6 100644
--- a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
+++ b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
@@ -427,7 +427,7 @@ void tst_QQuickListView::items(const QUrl &source)
     QMetaObject::invokeMethod(window->rootObject(), "checkProperties");
     QTRY_VERIFY(!testObject->error());
     QTRY_VERIFY(listview->currentItem());
-    QTRY_VERIFY(listview->highlightItem() == 0);
+    QTRY_VERIFY(!listview->highlightItem());
 
     // back to normal highlight
     testObject->setInvalidHighlight(false);
@@ -444,7 +444,7 @@ void tst_QQuickListView::items(const QUrl &source)
     listview->forceLayout();
 
     int itemCount = findItems<QQuickItem>(contentItem, "wrapper").count();
-    QTRY_VERIFY(itemCount == 0);
+    QTRY_COMPARE(itemCount, 0);
 
     QTRY_COMPARE(listview->highlightResizeVelocity(), 1000.0);
     QTRY_COMPARE(listview->highlightMoveVelocity(), 100000.0);
@@ -568,7 +568,7 @@ void tst_QQuickListView::inserted(const QUrl &source)
     // Insert item outside visible area
     model.insertItem(1, "Hello", "1324");
 
-    QTRY_VERIFY(listview->contentY() == 80);
+    QTRY_COMPARE(listview->contentY(), qreal(80));
 
     // Confirm items positioned correctly
     for (int i = 5; i < 5+15; ++i) {
@@ -588,7 +588,7 @@ void tst_QQuickListView::inserted(const QUrl &source)
     QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", 0);
     QVERIFY(item);
     QCOMPARE(item->y(), 0.);
-    QTRY_VERIFY(listview->contentY() == 0);
+    QTRY_COMPARE(listview->contentY(), qreal(0));
 
     delete window;
     delete testObject;
@@ -921,7 +921,7 @@ void tst_QQuickListView::removed(const QUrl &source, bool /* animated */)
         QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i);
         if (!item) qWarning() << "Item" << i << "not found";
         QTRY_VERIFY(item);
-        QTRY_VERIFY(item->y() == i*20);
+        QTRY_COMPARE(item->y(), qreal(i*20));
     }
 
     // Remove first item (which is the current item);
@@ -973,7 +973,7 @@ void tst_QQuickListView::removed(const QUrl &source, bool /* animated */)
     }
 
     // Remove current index
-    QTRY_VERIFY(listview->currentIndex() == 9);
+    QTRY_COMPARE(listview->currentIndex(), 9);
     QQuickItem *oldCurrent = listview->currentItem();
     model.removeItem(9);
 
@@ -1009,7 +1009,7 @@ void tst_QQuickListView::removed(const QUrl &source, bool /* animated */)
     model.removeItem(6);
 
     QTRY_COMPARE(listview->currentIndex(), 7);
-    QTRY_VERIFY(listview->currentItem() == oldCurrent);
+    QTRY_COMPARE(listview->currentItem(), oldCurrent);
 
     listview->setContentY(80);
     QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
@@ -1277,22 +1277,22 @@ void tst_QQuickListView::clear(const QUrl &source, QQuickItemView::VerticalLayou
     model.clear();
 
     QTRY_COMPARE(findItems<QQuickListView>(contentItem, "wrapper").count(), 0);
-    QTRY_VERIFY(listview->count() == 0);
-    QTRY_VERIFY(listview->currentItem() == 0);
+    QTRY_COMPARE(listview->count(), 0);
+    QTRY_VERIFY(!listview->currentItem());
     if (verticalLayoutDirection == QQuickItemView::TopToBottom)
         QTRY_COMPARE(listview->contentY(), 0.0);
     else
         QTRY_COMPARE(listview->contentY(), -listview->height());
-    QVERIFY(listview->currentIndex() == -1);
+    QCOMPARE(listview->currentIndex(), -1);
 
     QCOMPARE(listview->contentHeight(), 0.0);
 
     // confirm sanity when adding an item to cleared list
     model.addItem("New", "1");
     listview->forceLayout();
-    QTRY_VERIFY(listview->count() == 1);
+    QTRY_COMPARE(listview->count(), 1);
     QVERIFY(listview->currentItem() != 0);
-    QVERIFY(listview->currentIndex() == 0);
+    QCOMPARE(listview->currentIndex(), 0);
 
     delete window;
     delete testObject;
@@ -1810,7 +1810,7 @@ void tst_QQuickListView::swapWithFirstItem()
     // ensure content position is stable
     listview->setContentY(0);
     model.moveItem(1, 0);
-    QTRY_VERIFY(listview->contentY() == 0);
+    QTRY_COMPARE(listview->contentY(), qreal(0));
 
     delete testObject;
     delete window;
@@ -1948,11 +1948,11 @@ void tst_QQuickListView::spacing()
         QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i);
         if (!item) qWarning() << "Item" << i << "not found";
         QTRY_VERIFY(item);
-        QTRY_VERIFY(item->y() == i*20);
+        QTRY_COMPARE(item->y(), qreal(i*20));
     }
 
     listview->setSpacing(10);
-    QTRY_VERIFY(listview->spacing() == 10);
+    QTRY_COMPARE(listview->spacing(), qreal(10));
 
     // Confirm items positioned correctly
     QTRY_VERIFY(findItems<QQuickItem>(contentItem, "wrapper").count() == 11);
@@ -1960,7 +1960,7 @@ void tst_QQuickListView::spacing()
         QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i);
         if (!item) qWarning() << "Item" << i << "not found";
         QTRY_VERIFY(item);
-        QTRY_VERIFY(item->y() == i*30);
+        QTRY_COMPARE(item->y(), qreal(i*30));
     }
 
     listview->setSpacing(0);
@@ -2687,7 +2687,7 @@ void tst_QQuickListView::currentIndex()
     listview->setCurrentIndex(20);
     QTRY_VERIFY(listview->verticalVelocity() != 0.0);
     listview->setCurrentIndex(0);
-    QTRY_VERIFY(listview->verticalVelocity() == 0.0);
+    QTRY_COMPARE(listview->verticalVelocity(), 0.0);
 
     // footer should become visible if it is out of view, and then current index is set to count-1
     window->rootObject()->setProperty("showFooter", true);
@@ -2813,7 +2813,7 @@ void tst_QQuickListView::keyNavigation()
 
     window->requestActivate();
     QTest::qWaitForWindowActive(window);
-    QTRY_VERIFY(qGuiApp->focusWindow() == window);
+    QTRY_COMPARE(qGuiApp->focusWindow(), window);
 
     QTest::keyClick(window, forwardsKey);
     QCOMPARE(listview->currentIndex(), 1);
@@ -2922,7 +2922,7 @@ void tst_QQuickListView::itemList()
     QQmlObjectModel *model = window->rootObject()->findChild<QQmlObjectModel*>("itemModel");
     QTRY_VERIFY(model != 0);
 
-    QTRY_VERIFY(model->count() == 3);
+    QTRY_COMPARE(model->count(), 3);
     QTRY_COMPARE(listview->currentIndex(), 0);
 
     QQuickItem *item = findItem<QQuickItem>(contentItem, "item1");
@@ -2963,7 +2963,7 @@ void tst_QQuickListView::itemListFlicker()
     QQmlObjectModel *model = window->rootObject()->findChild<QQmlObjectModel*>("itemModel");
     QTRY_VERIFY(model != 0);
 
-    QTRY_VERIFY(model->count() == 3);
+    QTRY_COMPARE(model->count(), 3);
     QTRY_COMPARE(listview->currentIndex(), 0);
 
     QQuickItem *item;
@@ -3029,14 +3029,14 @@ void tst_QQuickListView::cacheBuffer()
         QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i);
         if (!item) qWarning() << "Item" << i << "not found";
         QTRY_VERIFY(item);
-        QTRY_VERIFY(item->y() == i*20);
+        QTRY_COMPARE(item->y(), qreal(i*20));
     }
 
     QQmlIncubationController controller;
     window->engine()->setIncubationController(&controller);
 
     testObject->setCacheBuffer(200);
-    QTRY_VERIFY(listview->cacheBuffer() == 200);
+    QTRY_COMPARE(listview->cacheBuffer(), 200);
 
     // items will be created one at a time
     for (int i = itemCount; i < qMin(itemCount+10,model.count()); ++i) {
@@ -3062,7 +3062,7 @@ void tst_QQuickListView::cacheBuffer()
         QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i);
         if (!item) qWarning() << "Item" << i << "not found";
         QTRY_VERIFY(item);
-        QTRY_VERIFY(item->y() == i*20);
+        QTRY_COMPARE(item->y(), qreal(i*20));
     }
 
     // move view and confirm items in view are visible immediately and outside are created async
@@ -3072,7 +3072,7 @@ void tst_QQuickListView::cacheBuffer()
         QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i);
         if (!item) qWarning() << "Item" << i << "not found";
         QVERIFY(item);
-        QVERIFY(item->y() == i*20);
+        QCOMPARE(item->y(), qreal(i*20));
     }
 
     QVERIFY(findItem<QQuickItem>(listview, "wrapper", 32) == 0);
@@ -3533,7 +3533,7 @@ void tst_QQuickListView::QTBUG_11105()
         QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i);
         if (!item) qWarning() << "Item" << i << "not found";
         QTRY_VERIFY(item);
-        QTRY_VERIFY(item->y() == i*20);
+        QTRY_COMPARE(item->y(), qreal(i*20));
     }
 
     listview->positionViewAtIndex(20, QQuickListView::Beginning);
@@ -3627,7 +3627,7 @@ void tst_QQuickListView::header()
 
     QQuickText *header = 0;
     QTRY_VERIFY(header = findItem<QQuickText>(contentItem, "header"));
-    QVERIFY(header == listview->headerItem());
+    QCOMPARE(header, listview->headerItem());
 
     QCOMPARE(header->width(), 100.);
     QCOMPARE(header->height(), 30.);
@@ -3665,7 +3665,7 @@ void tst_QQuickListView::header()
     header = findItem<QQuickText>(contentItem, "header2");
     QVERIFY(header);
 
-    QVERIFY(header == listview->headerItem());
+    QCOMPARE(header, listview->headerItem());
 
     QCOMPARE(header->position(), changedHeaderPos);
     QCOMPARE(header->width(), 50.);
@@ -3816,7 +3816,7 @@ void tst_QQuickListView::headerChangesViewport()
 
     QQuickText *header = 0;
     QTRY_VERIFY(header = findItem<QQuickText>(contentItem, "header"));
-    QVERIFY(header == listview->headerItem());
+    QCOMPARE(header, listview->headerItem());
 
     QCOMPARE(header->height(), 20.);
     QCOMPARE(listview->contentHeight(), 20.);
@@ -3867,7 +3867,7 @@ void tst_QQuickListView::footer()
     QQuickText *footer = findItem<QQuickText>(contentItem, "footer");
     QVERIFY(footer);
 
-    QVERIFY(footer == listview->footerItem());
+    QCOMPARE(footer, listview->footerItem());
 
     QCOMPARE(footer->position(), initialFooterPos);
     QCOMPARE(footer->width(), 100.);
@@ -3927,7 +3927,7 @@ void tst_QQuickListView::footer()
     footer = findItem<QQuickText>(contentItem, "footer2");
     QVERIFY(footer);
 
-    QVERIFY(footer == listview->footerItem());
+    QCOMPARE(footer, listview->footerItem());
 
     QCOMPARE(footer->position(), changedFooterPos);
     QCOMPARE(footer->width(), 50.);
@@ -4160,11 +4160,11 @@ void tst_QQuickListView::resetModel_headerFooter()
 
     // A reset should not force a new header or footer to be created.
     QQuickItem *newHeader = findItem<QQuickItem>(contentItem, "header");
-    QVERIFY(newHeader == header);
+    QCOMPARE(newHeader, header);
     QCOMPARE(header->y(), -header->height());
 
     QQuickItem *newFooter = findItem<QQuickItem>(contentItem, "footer");
-    QVERIFY(newFooter == footer);
+    QCOMPARE(newFooter, footer);
     QCOMPARE(footer->y(), 30.*4);
 
     delete window;
@@ -4669,7 +4669,7 @@ void tst_QQuickListView::indexAt_itemAt()
         QVERIFY(item);
     }
     QCOMPARE(listview->indexAt(x,y), index);
-    QVERIFY(listview->itemAt(x,y) == item);
+    QCOMPARE(listview->itemAt(x,y), item);
 
     releaseView(window);
     delete testObject;
@@ -4833,7 +4833,7 @@ void tst_QQuickListView::rightToLeft()
     QQmlObjectModel *model = window->rootObject()->findChild<QQmlObjectModel*>("itemModel");
     QTRY_VERIFY(model != 0);
 
-    QTRY_VERIFY(model->count() == 3);
+    QTRY_COMPARE(model->count(), 3);
     QTRY_COMPARE(listview->currentIndex(), 0);
 
     // initial position at first item, right edge aligned
@@ -4898,7 +4898,7 @@ void tst_QQuickListView::test_mirroring()
     foreach (const QString objectName, objectNames)
         QCOMPARE(findItem<QQuickItem>(listviewA, objectName)->x(), findItem<QQuickItem>(listviewB, objectName)->x());
 
-    QVERIFY(listviewB->layoutDirection() == listviewB->effectiveLayoutDirection());
+    QCOMPARE(listviewB->layoutDirection(), listviewB->effectiveLayoutDirection());
     QQuickItemPrivate::get(listviewB)->setLayoutMirror(true);
     QVERIFY(listviewB->layoutDirection() != listviewB->effectiveLayoutDirection());
 
@@ -7042,7 +7042,7 @@ void tst_QQuickListView::matchIndexLists(const QVariantList &indexLists, const Q
 void tst_QQuickListView::matchItemsAndIndexes(const QVariantMap &items, const QaimModel &model, const QList<int> &expectedIndexes)
 {
     for (QVariantMap::const_iterator it = items.begin(); it != items.end(); ++it) {
-        QVERIFY(it.value().type() == QVariant::Int);
+        QCOMPARE(it.value().type(), QVariant::Int);
         QString name = it.key();
         int itemIndex = it.value().toInt();
         QVERIFY2(expectedIndexes.contains(itemIndex), QTest::toString(QString("Index %1 not found in expectedIndexes").arg(itemIndex)));
@@ -7056,7 +7056,7 @@ void tst_QQuickListView::matchItemsAndIndexes(const QVariantMap &items, const Qa
 void tst_QQuickListView::matchItemLists(const QVariantList &itemLists, const QList<QQuickItem *> &expectedItems)
 {
     for (int i=0; i<itemLists.count(); i++) {
-        QVERIFY(itemLists[i].type() == QVariant::List);
+        QCOMPARE(itemLists[i].type(), QVariant::List);
         QVariantList current = itemLists[i].toList();
         for (int j=0; j<current.count(); j++) {
             QQuickItem *o = qobject_cast<QQuickItem*>(current[j].value<QObject*>());
@@ -7098,7 +7098,7 @@ void tst_QQuickListView::flickBeyondBounds()
         QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i);
         if (!item) qWarning() << "Item" << i << "not found";
         QTRY_VERIFY(item);
-        QTRY_VERIFY(item->y() == i*45);
+        QTRY_COMPARE(item->y(), qreal(i*45));
     }
 
     delete window;
diff --git a/tests/auto/quick/qquickloader/tst_qquickloader.cpp b/tests/auto/quick/qquickloader/tst_qquickloader.cpp
index 3dd2551d9d..e72b38e06c 100644
--- a/tests/auto/quick/qquickloader/tst_qquickloader.cpp
+++ b/tests/auto/quick/qquickloader/tst_qquickloader.cpp
@@ -236,7 +236,7 @@ void tst_QQuickLoader::clear()
         QCOMPARE(loader->progress(), 1.0);
         QCOMPARE(static_cast<QQuickItem*>(loader)->childItems().count(), 1);
 
-        QTRY_VERIFY(loader->item() == 0);
+        QTRY_VERIFY(!loader->item());
         QCOMPARE(loader->progress(), 0.0);
         QCOMPARE(loader->status(), QQuickLoader::Null);
         QCOMPARE(static_cast<QQuickItem*>(loader)->childItems().count(), 0);
@@ -256,7 +256,7 @@ void tst_QQuickLoader::clear()
 
         loader->setSourceComponent(0);
 
-        QVERIFY(loader->item() == 0);
+        QVERIFY(!loader->item());
         QCOMPARE(loader->progress(), 0.0);
         QCOMPARE(loader->status(), QQuickLoader::Null);
         QCOMPARE(static_cast<QQuickItem*>(loader)->childItems().count(), 0);
@@ -276,7 +276,7 @@ void tst_QQuickLoader::clear()
 
         QMetaObject::invokeMethod(item, "clear");
 
-        QVERIFY(loader->item() == 0);
+        QVERIFY(!loader->item());
         QCOMPARE(loader->progress(), 0.0);
         QCOMPARE(loader->status(), QQuickLoader::Null);
         QCOMPARE(static_cast<QQuickItem*>(loader)->childItems().count(), 0);
@@ -447,7 +447,7 @@ void tst_QQuickLoader::networkRequestUrl()
     QQuickLoader *loader = qobject_cast<QQuickLoader*>(component.create());
     QVERIFY(loader != 0);
 
-    QTRY_VERIFY(loader->status() == QQuickLoader::Ready);
+    QTRY_COMPARE(loader->status(), QQuickLoader::Ready);
 
     QVERIFY(loader->item());
     QCOMPARE(loader->progress(), 1.0);
@@ -480,7 +480,7 @@ void tst_QQuickLoader::networkComponent()
 
     QQuickLoader *loader = qobject_cast<QQuickLoader*>(item->children().at(1));
     QVERIFY(loader);
-    QTRY_VERIFY(loader->status() == QQuickLoader::Ready);
+    QTRY_COMPARE(loader->status(), QQuickLoader::Ready);
 
     QVERIFY(loader->item());
     QCOMPARE(loader->progress(), 1.0);
@@ -505,9 +505,9 @@ void tst_QQuickLoader::failNetworkRequest()
     QQuickLoader *loader = qobject_cast<QQuickLoader*>(component.create());
     QVERIFY(loader != 0);
 
-    QTRY_VERIFY(loader->status() == QQuickLoader::Error);
+    QTRY_COMPARE(loader->status(), QQuickLoader::Error);
 
-    QVERIFY(loader->item() == 0);
+    QVERIFY(!loader->item());
     QCOMPARE(loader->progress(), 1.0);
     QCOMPARE(loader->property("did_load").toInt(), 123);
     QCOMPARE(static_cast<QQuickItem*>(loader)->childItems().count(), 0);
@@ -525,11 +525,11 @@ void tst_QQuickLoader::active()
         QQuickLoader *loader = object->findChild<QQuickLoader*>("loader");
 
         QVERIFY(loader->active() == false); // set manually to false
-        QVERIFY(loader->item() == 0);
+        QVERIFY(!loader->item());
         QMetaObject::invokeMethod(object, "doSetSourceComponent");
-        QVERIFY(loader->item() == 0);
+        QVERIFY(!loader->item());
         QMetaObject::invokeMethod(object, "doSetSource");
-        QVERIFY(loader->item() == 0);
+        QVERIFY(!loader->item());
         QMetaObject::invokeMethod(object, "doSetActive");
         QVERIFY(loader->item() != 0);
 
@@ -598,7 +598,7 @@ void tst_QQuickLoader::active()
         QVERIFY(loader->item() != 0);
         int currItemChangedCount = loader->property("itemChangedCount").toInt();
         QMetaObject::invokeMethod(object, "doSetInactive");
-        QVERIFY(loader->item() == 0);
+        QVERIFY(!loader->item());
         QCOMPARE(loader->property("itemChangedCount").toInt(), (currItemChangedCount+1));
 
         delete object;
@@ -781,7 +781,7 @@ void tst_QQuickLoader::initialPropertyValuesError()
     QVERIFY(object != 0);
     QQuickLoader *loader = object->findChild<QQuickLoader*>("loader");
     QVERIFY(loader != 0);
-    QVERIFY(loader->item() == 0);
+    QVERIFY(!loader->item());
     delete object;
 }
 
@@ -803,7 +803,7 @@ void tst_QQuickLoader::deleteComponentCrash()
     QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete);
     QCoreApplication::processEvents();
     QTRY_COMPARE(static_cast<QQuickItem*>(loader)->childItems().count(), 1);
-    QVERIFY(loader->source() == testFileUrl("BlueRect.qml"));
+    QCOMPARE(loader->source(), testFileUrl("BlueRect.qml"));
 
     delete item;
 }
@@ -833,7 +833,7 @@ void tst_QQuickLoader::vmeErrors()
     QTest::ignoreMessage(QtWarningMsg, err.toLatin1().constData());
     QQuickLoader *loader = qobject_cast<QQuickLoader*>(component.create());
     QVERIFY(loader);
-    QVERIFY(loader->item() == 0);
+    QVERIFY(!loader->item());
 
     delete loader;
 }
@@ -1098,7 +1098,7 @@ void tst_QQuickLoader::parented()
     QQuickItem *item = root->findChild<QQuickItem*>("comp");
     QVERIFY(item);
 
-    QVERIFY(item->parentItem() == root);
+    QCOMPARE(item->parentItem(), root);
 
     QCOMPARE(item->width(), 300.);
     QCOMPARE(item->height(), 300.);
diff --git a/tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp b/tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp
index da8bb9e94d..6e6c9da829 100644
--- a/tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp
+++ b/tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp
@@ -169,7 +169,7 @@ void tst_QQuickMouseArea::dragProperties()
     // target
     QQuickItem *blackRect = window.rootObject()->findChild<QQuickItem*>("blackrect");
     QVERIFY(blackRect != 0);
-    QVERIFY(blackRect == drag->target());
+    QCOMPARE(blackRect, drag->target());
     QQuickItem *rootItem = qobject_cast<QQuickItem*>(window.rootObject());
     QVERIFY(rootItem != 0);
     QSignalSpy targetSpy(drag, SIGNAL(targetChanged()));
@@ -267,14 +267,14 @@ void tst_QQuickMouseArea::resetDrag()
     // target
     QQuickItem *blackRect = window.rootObject()->findChild<QQuickItem*>("blackrect");
     QVERIFY(blackRect != 0);
-    QVERIFY(blackRect == drag->target());
+    QCOMPARE(blackRect, drag->target());
     QQuickItem *rootItem = qobject_cast<QQuickItem*>(window.rootObject());
     QVERIFY(rootItem != 0);
     QSignalSpy targetSpy(drag, SIGNAL(targetChanged()));
     QVERIFY(drag->target() != 0);
     window.rootContext()->setContextProperty("haveTarget", QVariant(false));
     QCOMPARE(targetSpy.count(),1);
-    QVERIFY(drag->target() == 0);
+    QVERIFY(!drag->target());
 }
 
 void tst_QQuickMouseArea::dragging()
@@ -300,7 +300,7 @@ void tst_QQuickMouseArea::dragging()
     // target
     QQuickItem *blackRect = window.rootObject()->findChild<QQuickItem*>("blackrect");
     QVERIFY(blackRect != 0);
-    QVERIFY(blackRect == drag->target());
+    QCOMPARE(blackRect, drag->target());
 
     QVERIFY(!drag->active());
 
@@ -347,7 +347,7 @@ void tst_QQuickMouseArea::dragSmoothed()
     mouseRegion->setAcceptedButtons(Qt::LeftButton);
     QQuickItem *blackRect = window.rootObject()->findChild<QQuickItem*>("blackrect");
     QVERIFY(blackRect != 0);
-    QVERIFY(blackRect == drag->target());
+    QCOMPARE(blackRect, drag->target());
     QVERIFY(!drag->active());
     QTest::mousePress(&window, Qt::LeftButton, 0, QPoint(100,100));
     QVERIFY(!drag->active());
@@ -393,7 +393,7 @@ void tst_QQuickMouseArea::dragThreshold()
     mouseRegion->setAcceptedButtons(Qt::LeftButton);
     QQuickItem *blackRect = window.rootObject()->findChild<QQuickItem*>("blackrect");
     QVERIFY(blackRect != 0);
-    QVERIFY(blackRect == drag->target());
+    QCOMPARE(blackRect, drag->target());
     QVERIFY(!drag->active());
     QTest::mousePress(&window, Qt::LeftButton, 0, QPoint(100,100));
     QVERIFY(!drag->active());
@@ -451,7 +451,7 @@ void tst_QQuickMouseArea::invalidDrag()
     // target
     QQuickItem *blackRect = window.rootObject()->findChild<QQuickItem*>("blackrect");
     QVERIFY(blackRect != 0);
-    QVERIFY(blackRect == drag->target());
+    QCOMPARE(blackRect, drag->target());
 
     QVERIFY(!drag->active());
 
@@ -501,7 +501,7 @@ void tst_QQuickMouseArea::cancelDragging()
     // target
     QQuickItem *blackRect = window.rootObject()->findChild<QQuickItem*>("blackrect");
     QVERIFY(blackRect != 0);
-    QVERIFY(blackRect == drag->target());
+    QCOMPARE(blackRect, drag->target());
 
     QVERIFY(!drag->active());
 
@@ -655,7 +655,7 @@ void tst_QQuickMouseArea::noOnClickedWithPressAndHold()
         QMouseEvent pressEvent(QEvent::MouseButtonPress, QPoint(100, 100), Qt::LeftButton, Qt::LeftButton, 0);
         QGuiApplication::sendEvent(&window, &pressEvent);
 
-        QVERIFY(mouseArea->pressedButtons() == Qt::LeftButton);
+        QCOMPARE(mouseArea->pressedButtons(), Qt::LeftButton);
         QVERIFY(!window.rootObject()->property("clicked").toBool());
         QVERIFY(!window.rootObject()->property("held").toBool());
 
@@ -1268,7 +1268,7 @@ void tst_QQuickMouseArea::disableAfterPress()
     // target
     QQuickItem *blackRect = window.rootObject()->findChild<QQuickItem*>("blackrect");
     QVERIFY(blackRect != 0);
-    QVERIFY(blackRect == drag->target());
+    QCOMPARE(blackRect, drag->target());
 
     QVERIFY(!drag->active());
 
@@ -1561,7 +1561,7 @@ void tst_QQuickMouseArea::changeAxis()
     // target
     QQuickItem *blackRect = view.rootObject()->findChild<QQuickItem*>("blackrect");
     QVERIFY(blackRect != 0);
-    QVERIFY(blackRect == drag->target());
+    QCOMPARE(blackRect, drag->target());
 
     QVERIFY(!drag->active());
 
diff --git a/tests/auto/quick/qquickmultipointtoucharea/tst_qquickmultipointtoucharea.cpp b/tests/auto/quick/qquickmultipointtoucharea/tst_qquickmultipointtoucharea.cpp
index a3459ca626..4da4767d7b 100644
--- a/tests/auto/quick/qquickmultipointtoucharea/tst_qquickmultipointtoucharea.cpp
+++ b/tests/auto/quick/qquickmultipointtoucharea/tst_qquickmultipointtoucharea.cpp
@@ -719,7 +719,7 @@ void tst_QQuickMultiPointTouchArea::inFlickable()
     QTest::mouseMove(window.data(), p1);
     QQuickTouchUtils::flush(window.data());
 
-    QVERIFY(flickable->contentY() == 0);
+    QCOMPARE(flickable->contentY(), qreal(0));
     QCOMPARE(point11->pressed(), true);
     QCOMPARE(point12->pressed(), true);
 
diff --git a/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp b/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp
index c0e241fec8..eed947bfcd 100644
--- a/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp
+++ b/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp
@@ -185,8 +185,8 @@ void tst_QQuickPathView::initValues()
     QQuickPathView *obj = qobject_cast<QQuickPathView*>(c.create());
 
     QVERIFY(obj != 0);
-    QVERIFY(obj->path() == 0);
-    QVERIFY(obj->delegate() == 0);
+    QVERIFY(!obj->path());
+    QVERIFY(!obj->delegate());
     QCOMPARE(obj->model(), QVariant());
     QCOMPARE(obj->currentIndex(), 0);
     QCOMPARE(obj->offset(), 0.);
@@ -837,7 +837,7 @@ void tst_QQuickPathView::dataModel()
     QQuickRectangle *testItem = findItem<QQuickRectangle>(pathview, "wrapper", 4);
     QVERIFY(testItem != 0);
     testItem = findItem<QQuickRectangle>(pathview, "wrapper", 5);
-    QVERIFY(testItem == 0);
+    QVERIFY(!testItem);
 
     pathview->setCurrentIndex(1);
     QCOMPARE(pathview->currentIndex(), 1);
@@ -1816,7 +1816,7 @@ void tst_QQuickPathView::cancelDrag()
     item->grabMouse();
 
     // returns to a snap point.
-    QTRY_VERIFY(pathview->offset() == qFloor(pathview->offset()));
+    QTRY_COMPARE(pathview->offset(), qreal(qFloor(pathview->offset())));
     QTRY_VERIFY(!pathview->isMoving());
     QVERIFY(!pathview->isDragging());
     QCOMPARE(draggingSpy.count(), 2);
@@ -1899,7 +1899,7 @@ void tst_QQuickPathView::snapToItem()
     QVERIFY(pathview->isMoving());
     QTRY_VERIFY_WITH_TIMEOUT(!pathview->isMoving(), 50000);
 
-    QVERIFY(pathview->offset() == qFloor(pathview->offset()));
+    QCOMPARE(pathview->offset(), qreal(qFloor(pathview->offset())));
 
     if (enforceRange)
         QVERIFY(pathview->currentIndex() != currentIndex);
@@ -2053,7 +2053,7 @@ void tst_QQuickPathView::indexAt_itemAt()
         QVERIFY(item);
     }
     QCOMPARE(pathview->indexAt(x,y), index);
-    QVERIFY(pathview->itemAt(x,y) == item);
+    QCOMPARE(pathview->itemAt(x,y), item);
 
 }
 
diff --git a/tests/auto/quick/qquickpincharea/tst_qquickpincharea.cpp b/tests/auto/quick/qquickpincharea/tst_qquickpincharea.cpp
index 8063453993..3988a90aed 100644
--- a/tests/auto/quick/qquickpincharea/tst_qquickpincharea.cpp
+++ b/tests/auto/quick/qquickpincharea/tst_qquickpincharea.cpp
@@ -91,7 +91,7 @@ void tst_QQuickPinchArea::pinchProperties()
     // target
     QQuickItem *blackRect = window->rootObject()->findChild<QQuickItem*>("blackrect");
     QVERIFY(blackRect != 0);
-    QVERIFY(blackRect == pinch->target());
+    QCOMPARE(blackRect, pinch->target());
     QQuickItem *rootItem = qobject_cast<QQuickItem*>(window->rootObject());
     QVERIFY(rootItem != 0);
     QSignalSpy targetSpy(pinch, SIGNAL(targetChanged()));
diff --git a/tests/auto/quick/qquickpixmapcache/tst_qquickpixmapcache.cpp b/tests/auto/quick/qquickpixmapcache/tst_qquickpixmapcache.cpp
index 584cb78d3d..627ff19fb8 100644
--- a/tests/auto/quick/qquickpixmapcache/tst_qquickpixmapcache.cpp
+++ b/tests/auto/quick/qquickpixmapcache/tst_qquickpixmapcache.cpp
@@ -161,10 +161,10 @@ void tst_qquickpixmapcache::single()
     if (incache) {
         QCOMPARE(pixmap.error(), expectedError);
         if (exists) {
-            QVERIFY(pixmap.status() == QQuickPixmap::Ready);
+            QCOMPARE(pixmap.status(), QQuickPixmap::Ready);
             QVERIFY(pixmap.width() > 0);
         } else {
-            QVERIFY(pixmap.status() == QQuickPixmap::Error);
+            QCOMPARE(pixmap.status(), QQuickPixmap::Error);
             QVERIFY(pixmap.width() <= 0);
         }
     } else {
@@ -176,10 +176,10 @@ void tst_qquickpixmapcache::single()
         QVERIFY(!QTestEventLoop::instance().timeout());
         QVERIFY(getter.gotslot);
         if (exists) {
-            QVERIFY(pixmap.status() == QQuickPixmap::Ready);
+            QCOMPARE(pixmap.status(), QQuickPixmap::Ready);
             QVERIFY(pixmap.width() > 0);
         } else {
-            QVERIFY(pixmap.status() == QQuickPixmap::Error);
+            QCOMPARE(pixmap.status(), QQuickPixmap::Error);
             QVERIFY(pixmap.width() <= 0);
         }
         QCOMPARE(pixmap.error(), expectedError);
@@ -309,7 +309,7 @@ void tst_qquickpixmapcache::massive()
     QVERIFY(p2.isReady());
     QVERIFY(p2.image().size() == QSize(10000, 1000));
 
-    QVERIFY(p2.image().cacheKey() == cachekey);
+    QCOMPARE(p2.image().cacheKey(), cachekey);
     }
 
     // Confirm that massive images are removed from the cache when
diff --git a/tests/auto/quick/qquickpositioners/tst_qquickpositioners.cpp b/tests/auto/quick/qquickpositioners/tst_qquickpositioners.cpp
index 474fdf9f8d..69359503fe 100644
--- a/tests/auto/quick/qquickpositioners/tst_qquickpositioners.cpp
+++ b/tests/auto/quick/qquickpositioners/tst_qquickpositioners.cpp
@@ -3847,8 +3847,8 @@ void tst_qquickpositioners::test_allInvisible()
 
     QQuickRow *row = window->rootObject()->findChild<QQuickRow*>("row");
     QVERIFY(row != 0);
-    QVERIFY(row->width() == 0);
-    QVERIFY(row->height() == 0);
+    QCOMPARE(row->width(), qreal(0));
+    QCOMPARE(row->height(), qreal(0));
 
     // test padding
     row->setProperty("padding", 1);
@@ -3862,8 +3862,8 @@ void tst_qquickpositioners::test_allInvisible()
 
     QQuickColumn *column = window->rootObject()->findChild<QQuickColumn*>("column");
     QVERIFY(column != 0);
-    QVERIFY(column->width() == 0);
-    QVERIFY(column->height() == 0);
+    QCOMPARE(column->width(), qreal(0));
+    QCOMPARE(column->height(), qreal(0));
 
     // test padding
     column->setProperty("padding", 1);
@@ -3877,8 +3877,8 @@ void tst_qquickpositioners::test_allInvisible()
 
     QQuickGrid *grid = window->rootObject()->findChild<QQuickGrid*>("grid");
     QVERIFY(grid != 0);
-    QVERIFY(grid->width() == 0);
-    QVERIFY(grid->height() == 0);
+    QCOMPARE(grid->width(), qreal(0));
+    QCOMPARE(grid->height(), qreal(0));
 
     // test padding
     grid->setProperty("padding", 1);
@@ -3892,8 +3892,8 @@ void tst_qquickpositioners::test_allInvisible()
 
     QQuickFlow *flow = window->rootObject()->findChild<QQuickFlow*>("flow");
     QVERIFY(flow != 0);
-    QVERIFY(flow->width() == 0);
-    QVERIFY(flow->height() == 0);
+    QCOMPARE(flow->width(), qreal(0));
+    QCOMPARE(flow->height(), qreal(0));
 
     // test padding
     flow->setProperty("padding", 1);
@@ -3917,7 +3917,7 @@ void tst_qquickpositioners::test_attachedproperties()
     QVERIFY(greenRect != 0);
 
     int posIndex = greenRect->property("posIndex").toInt();
-    QVERIFY(posIndex == 0);
+    QCOMPARE(posIndex, 0);
     bool isFirst = greenRect->property("isFirstItem").toBool();
     QVERIFY(isFirst);
     bool isLast = greenRect->property("isLastItem").toBool();
@@ -3927,7 +3927,7 @@ void tst_qquickpositioners::test_attachedproperties()
     QVERIFY(yellowRect != 0);
 
     posIndex = yellowRect->property("posIndex").toInt();
-    QVERIFY(posIndex == -1);
+    QCOMPARE(posIndex, -1);
     isFirst = yellowRect->property("isFirstItem").toBool();
     QVERIFY(!isFirst);
     isLast = yellowRect->property("isLastItem").toBool();
@@ -3936,7 +3936,7 @@ void tst_qquickpositioners::test_attachedproperties()
     yellowRect->metaObject()->invokeMethod(yellowRect, "onDemandPositioner");
 
     posIndex = yellowRect->property("posIndex").toInt();
-    QVERIFY(posIndex == 1);
+    QCOMPARE(posIndex, 1);
     isFirst = yellowRect->property("isFirstItem").toBool();
     QVERIFY(!isFirst);
     isLast = yellowRect->property("isLastItem").toBool();
@@ -3966,7 +3966,7 @@ void tst_qquickpositioners::test_attachedproperties_dynamic()
     QVERIFY(rect0 != 0);
 
     int posIndex = rect0->property("index").toInt();
-    QVERIFY(posIndex == 0);
+    QCOMPARE(posIndex, 0);
     bool isFirst = rect0->property("firstItem").toBool();
     QVERIFY(isFirst);
     bool isLast = rect0->property("lastItem").toBool();
@@ -3976,7 +3976,7 @@ void tst_qquickpositioners::test_attachedproperties_dynamic()
     QVERIFY(rect1 != 0);
 
     posIndex = rect1->property("index").toInt();
-    QVERIFY(posIndex == 1);
+    QCOMPARE(posIndex, 1);
     isFirst = rect1->property("firstItem").toBool();
     QVERIFY(!isFirst);
     isLast = rect1->property("lastItem").toBool();
@@ -3984,7 +3984,7 @@ void tst_qquickpositioners::test_attachedproperties_dynamic()
 
     row->metaObject()->invokeMethod(row, "createSubRect");
 
-    QTRY_VERIFY(rect1->property("index").toInt() == 1);
+    QTRY_COMPARE(rect1->property("index").toInt(), 1);
     QTRY_VERIFY(!rect1->property("firstItem").toBool());
     QTRY_VERIFY(!rect1->property("lastItem").toBool());
 
@@ -3992,7 +3992,7 @@ void tst_qquickpositioners::test_attachedproperties_dynamic()
     QVERIFY(rect2 != 0);
 
     posIndex = rect2->property("index").toInt();
-    QVERIFY(posIndex == 2);
+    QCOMPARE(posIndex, 2);
     isFirst = rect2->property("firstItem").toBool();
     QVERIFY(!isFirst);
     isLast = rect2->property("lastItem").toBool();
@@ -4003,7 +4003,7 @@ void tst_qquickpositioners::test_attachedproperties_dynamic()
     QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete);
     QCoreApplication::processEvents();
 
-    QTRY_VERIFY(rect1->property("index").toInt() == 1);
+    QTRY_COMPARE(rect1->property("index").toInt(), 1);
     QTRY_VERIFY(!rect1->property("firstItem").toBool());
     QTRY_VERIFY(rect1->property("lastItem").toBool());
 
@@ -4038,7 +4038,7 @@ void tst_qquickpositioners::matchIndexLists(const QVariantList &indexLists, cons
 void tst_qquickpositioners::matchItemsAndIndexes(const QVariantMap &items, const QaimModel &model, const QList<int> &expectedIndexes)
 {
     for (QVariantMap::const_iterator it = items.begin(); it != items.end(); ++it) {
-        QVERIFY(it.value().type() == QVariant::Int);
+        QCOMPARE(it.value().type(), QVariant::Int);
         QString name = it.key();
         int itemIndex = it.value().toInt();
         QVERIFY2(expectedIndexes.contains(itemIndex), QTest::toString(QString("Index %1 not found in expectedIndexes").arg(itemIndex)));
@@ -4052,7 +4052,7 @@ void tst_qquickpositioners::matchItemsAndIndexes(const QVariantMap &items, const
 void tst_qquickpositioners::matchItemLists(const QVariantList &itemLists, const QList<QQuickItem *> &expectedItems)
 {
     for (int i=0; i<itemLists.count(); i++) {
-        QVERIFY(itemLists[i].type() == QVariant::List);
+        QCOMPARE(itemLists[i].type(), QVariant::List);
         QVariantList current = itemLists[i].toList();
         for (int j=0; j<current.count(); j++) {
             QQuickItem *o = qobject_cast<QQuickItem*>(current[j].value<QObject*>());
diff --git a/tests/auto/quick/qquickrepeater/tst_qquickrepeater.cpp b/tests/auto/quick/qquickrepeater/tst_qquickrepeater.cpp
index ab03bbcdce..a34001b23a 100644
--- a/tests/auto/quick/qquickrepeater/tst_qquickrepeater.cpp
+++ b/tests/auto/quick/qquickrepeater/tst_qquickrepeater.cpp
@@ -447,16 +447,16 @@ void tst_QQuickRepeater::itemModel()
     QVERIFY(!testObject->error());
 
     QCOMPARE(container->childItems().count(), 4);
-    QVERIFY(qobject_cast<QObject*>(container->childItems().at(0))->objectName() == "item1");
-    QVERIFY(qobject_cast<QObject*>(container->childItems().at(1))->objectName() == "item2");
-    QVERIFY(qobject_cast<QObject*>(container->childItems().at(2))->objectName() == "item3");
-    QVERIFY(container->childItems().at(3) == repeater);
+    QCOMPARE(qobject_cast<QObject*>(container->childItems().at(0))->objectName(), QLatin1String("item1"));
+    QCOMPARE(qobject_cast<QObject*>(container->childItems().at(1))->objectName(), QLatin1String("item2"));
+    QCOMPARE(qobject_cast<QObject*>(container->childItems().at(2))->objectName(), QLatin1String("item3"));
+    QCOMPARE(container->childItems().at(3), repeater);
 
     QMetaObject::invokeMethod(window->rootObject(), "switchModel");
     QCOMPARE(container->childItems().count(), 3);
-    QVERIFY(qobject_cast<QObject*>(container->childItems().at(0))->objectName() == "item4");
-    QVERIFY(qobject_cast<QObject*>(container->childItems().at(1))->objectName() == "item5");
-    QVERIFY(container->childItems().at(2) == repeater);
+    QCOMPARE(qobject_cast<QObject*>(container->childItems().at(0))->objectName(), QLatin1String("item4"));
+    QCOMPARE(qobject_cast<QObject*>(container->childItems().at(1))->objectName(), QLatin1String("item5"));
+    QCOMPARE(container->childItems().at(2), repeater);
 
     testObject->setUseModel(false);
     QCOMPARE(container->childItems().count(), 1);
@@ -812,8 +812,8 @@ void tst_QQuickRepeater::invalidContextCrash()
     repeater->setParent(root.data());
 
     QCOMPARE(root->children().count(), 2);
-    QVERIFY(root->children().at(0) == model);
-    QVERIFY(root->children().at(1) == repeater);
+    QCOMPARE(root->children().at(0), model);
+    QCOMPARE(root->children().at(1), repeater);
 
     // Delete the root object, which will invalidate/delete the QML context
     // and then delete the child QObjects, which may try to access the context.
diff --git a/tests/auto/quick/qquicksmoothedanimation/tst_qquicksmoothedanimation.cpp b/tests/auto/quick/qquicksmoothedanimation/tst_qquicksmoothedanimation.cpp
index 04fdc4ecf7..10e91c455b 100644
--- a/tests/auto/quick/qquicksmoothedanimation/tst_qquicksmoothedanimation.cpp
+++ b/tests/auto/quick/qquicksmoothedanimation/tst_qquicksmoothedanimation.cpp
@@ -130,9 +130,9 @@ void tst_qquicksmoothedanimation::simpleAnimation()
     animation->setProperty("x");
     animation->setTo(200);
     animation->setDuration(250);
-    QVERIFY(animation->target() == rect);
-    QVERIFY(animation->property() == "x");
-    QVERIFY(animation->to() == 200);
+    QCOMPARE(animation->target(), rect);
+    QCOMPARE(animation->property(), QLatin1String("x"));
+    QCOMPARE(animation->to(), qreal(200));
     animation->start();
     QVERIFY(animation->isRunning());
     QTest::qWait(animation->duration());
@@ -147,7 +147,7 @@ void tst_qquicksmoothedanimation::simpleAnimation()
     QVERIFY(animation->isRunning());
     QVERIFY(animation->isPaused());
     animation->setCurrentTime(125);
-    QVERIFY(animation->currentTime() == 125);
+    QCOMPARE(animation->currentTime(), 125);
     QCOMPARE(rect->x(), qreal(100));
 }
 
diff --git a/tests/auto/quick/qquickstates/tst_qquickstates.cpp b/tests/auto/quick/qquickstates/tst_qquickstates.cpp
index 4748cd2514..a375a55877 100644
--- a/tests/auto/quick/qquickstates/tst_qquickstates.cpp
+++ b/tests/auto/quick/qquickstates/tst_qquickstates.cpp
@@ -1241,7 +1241,7 @@ void tst_qquickstates::deletingState()
     QVERIFY(state != 0);
     delete state;
 
-    QVERIFY(sg->findState("blue") == 0);
+    QVERIFY(!sg->findState("blue"));
 
     //### should we warn that state doesn't exist
     sg->setState("blue");
@@ -1317,7 +1317,7 @@ void tst_qquickstates::illegalObjectCreation()
 
     QQmlComponent component(&engine, testFileUrl("illegalObj.qml"));
     QList<QQmlError> errors = component.errors();
-    QVERIFY(errors.count() == 1);
+    QCOMPARE(errors.count(), 1);
     const QQmlError &error = errors.at(0);
     QCOMPARE(error.line(), 9);
     QCOMPARE(error.column(), 23);
diff --git a/tests/auto/quick/qquickstyledtext/tst_qquickstyledtext.cpp b/tests/auto/quick/qquickstyledtext/tst_qquickstyledtext.cpp
index 3c05d4ac73..95e495a74e 100644
--- a/tests/auto/quick/qquickstyledtext/tst_qquickstyledtext.cpp
+++ b/tests/auto/quick/qquickstyledtext/tst_qquickstyledtext.cpp
@@ -176,9 +176,9 @@ void tst_qquickstyledtext::textOutput()
         QCOMPARE(layoutFormats.at(i).start, formats.at(i).start);
         QCOMPARE(layoutFormats.at(i).length, formats.at(i).length);
         if (formats.at(i).type & Format::Bold)
-            QVERIFY(layoutFormats.at(i).format.fontWeight() == QFont::Bold);
+            QCOMPARE(layoutFormats.at(i).format.fontWeight(), int(QFont::Bold));
         else
-            QVERIFY(layoutFormats.at(i).format.fontWeight() == QFont::Normal);
+            QCOMPARE(layoutFormats.at(i).format.fontWeight(), int(QFont::Normal));
         QVERIFY(layoutFormats.at(i).format.fontItalic() == bool(formats.at(i).type & Format::Italic));
         QVERIFY(layoutFormats.at(i).format.fontUnderline() == bool(formats.at(i).type & Format::Underline));
     }
diff --git a/tests/auto/quick/qquicksystempalette/tst_qquicksystempalette.cpp b/tests/auto/quick/qquicksystempalette/tst_qquicksystempalette.cpp
index 5c0c5fd8d3..a4c4987ad9 100644
--- a/tests/auto/quick/qquicksystempalette/tst_qquicksystempalette.cpp
+++ b/tests/auto/quick/qquicksystempalette/tst_qquicksystempalette.cpp
@@ -97,7 +97,7 @@ void tst_qquicksystempalette::inactivePalette()
     QQuickSystemPalette *object = qobject_cast<QQuickSystemPalette*>(component.create());
 
     QVERIFY(object != 0);
-    QVERIFY(object->colorGroup() == QQuickSystemPalette::Inactive);
+    QCOMPARE(object->colorGroup(), QQuickSystemPalette::Inactive);
 
     QPalette palette;
     palette.setCurrentColorGroup(QPalette::Inactive);
@@ -127,7 +127,7 @@ void tst_qquicksystempalette::disabledPalette()
     QQuickSystemPalette *object = qobject_cast<QQuickSystemPalette*>(component.create());
 
     QVERIFY(object != 0);
-    QVERIFY(object->colorGroup() == QQuickSystemPalette::Disabled);
+    QCOMPARE(object->colorGroup(), QQuickSystemPalette::Disabled);
 
     QPalette palette;
     palette.setCurrentColorGroup(QPalette::Disabled);
diff --git a/tests/auto/quick/qquicktext/tst_qquicktext.cpp b/tests/auto/quick/qquicktext/tst_qquicktext.cpp
index a04f5e60af..c1f10f9788 100644
--- a/tests/auto/quick/qquicktext/tst_qquicktext.cpp
+++ b/tests/auto/quick/qquicktext/tst_qquicktext.cpp
@@ -242,7 +242,7 @@ void tst_qquicktext::text()
 
         QVERIFY(textObject != 0);
         QCOMPARE(textObject->text(), QString(""));
-        QVERIFY(textObject->width() == 0);
+        QCOMPARE(textObject->width(), qreal(0));
 
         delete textObject;
     }
@@ -359,7 +359,7 @@ void tst_qquicktext::width()
         QVERIFY(doc != 0);
 
         QCOMPARE(int(textObject->width()), int(doc->idealWidth()));
-        QVERIFY(textObject->textFormat() == QQuickText::RichText);
+        QCOMPARE(textObject->textFormat(), QQuickText::RichText);
 
         delete textObject;
     }
@@ -376,7 +376,7 @@ void tst_qquicktext::wrap()
         textHeight = textObject->height();
 
         QVERIFY(textObject != 0);
-        QVERIFY(textObject->wrapMode() == QQuickText::WordWrap);
+        QCOMPARE(textObject->wrapMode(), QQuickText::WordWrap);
         QCOMPARE(textObject->width(), 300.);
 
         delete textObject;
@@ -659,7 +659,7 @@ void tst_qquicktext::textFormat()
         QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create());
 
         QVERIFY(textObject != 0);
-        QVERIFY(textObject->textFormat() == QQuickText::RichText);
+        QCOMPARE(textObject->textFormat(), QQuickText::RichText);
 
         QQuickTextPrivate *textPrivate = QQuickTextPrivate::get(textObject);
         QVERIFY(textPrivate != 0);
@@ -673,7 +673,7 @@ void tst_qquicktext::textFormat()
         QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create());
 
         QVERIFY(textObject != 0);
-        QVERIFY(textObject->textFormat() == QQuickText::AutoText);
+        QCOMPARE(textObject->textFormat(), QQuickText::AutoText);
 
         QQuickTextPrivate *textPrivate = QQuickTextPrivate::get(textObject);
         QVERIFY(textPrivate != 0);
@@ -687,7 +687,7 @@ void tst_qquicktext::textFormat()
         QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create());
 
         QVERIFY(textObject != 0);
-        QVERIFY(textObject->textFormat() == QQuickText::PlainText);
+        QCOMPARE(textObject->textFormat(), QQuickText::PlainText);
 
         delete textObject;
     }
@@ -2136,8 +2136,8 @@ void tst_qquicktext::lineHeight()
     QQuickText *myText = window->rootObject()->findChild<QQuickText*>("myText");
     QVERIFY(myText != 0);
 
-    QVERIFY(myText->lineHeight() == 1);
-    QVERIFY(myText->lineHeightMode() == QQuickText::ProportionalHeight);
+    QCOMPARE(myText->lineHeight(), qreal(1));
+    QCOMPARE(myText->lineHeightMode(), QQuickText::ProportionalHeight);
 
     qreal h = myText->height();
     myText->setLineHeight(1.5);
@@ -2207,12 +2207,12 @@ void tst_qquicktext::implicitSize()
     QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create());
 
     QVERIFY(textObject->width() < textObject->implicitWidth());
-    QVERIFY(textObject->height() == textObject->implicitHeight());
+    QCOMPARE(textObject->height(), textObject->implicitHeight());
     QCOMPARE(textObject->property("iWidth").toReal(), textObject->implicitWidth());
 
     textObject->resetWidth();
-    QVERIFY(textObject->width() == textObject->implicitWidth());
-    QVERIFY(textObject->height() == textObject->implicitHeight());
+    QCOMPARE(textObject->width(), textObject->implicitWidth());
+    QCOMPARE(textObject->height(), textObject->implicitHeight());
 
     delete textObject;
 }
@@ -2748,7 +2748,7 @@ void tst_qquicktext::lineLaidOut()
             QVERIFY(r.x() == r.width() + 30);
         if (i >= 60) {
             QVERIFY(r.x() == r.width() * 2 + 60);
-            QVERIFY(r.height() == 20);
+            QCOMPARE(r.height(), qreal(20));
         }
     }
 
@@ -2926,7 +2926,7 @@ void tst_qquicktext::imgTagsAlign()
     QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create());
 
     QVERIFY(textObject != 0);
-    QVERIFY(textObject->height() == imgHeight);
+    QCOMPARE(textObject->height(), qreal(imgHeight));
 
     QQuickTextPrivate *textPrivate = QQuickTextPrivate::get(textObject);
     QVERIFY(textPrivate != 0);
@@ -2937,7 +2937,7 @@ void tst_qquicktext::imgTagsAlign()
     else if (align == "middle")
         QVERIFY(br.y() == imgHeight / 2.0 - br.height() / 2.0);
     else if (align == "top")
-        QVERIFY(br.y() == 0);
+        QCOMPARE(br.y(), qreal(0));
 
     delete textObject;
 }
@@ -2951,11 +2951,11 @@ void tst_qquicktext::imgTagsMultipleImages()
     QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create());
 
     QVERIFY(textObject != 0);
-    QVERIFY(textObject->height() == 85);
+    QCOMPARE(textObject->height(), qreal(85));
 
     QQuickTextPrivate *textPrivate = QQuickTextPrivate::get(textObject);
     QVERIFY(textPrivate != 0);
-    QVERIFY(textPrivate->extra->visibleImgTags.count() == 2);
+    QCOMPARE(textPrivate->extra->visibleImgTags.count(), 2);
 
     delete textObject;
 }
@@ -2968,9 +2968,9 @@ void tst_qquicktext::imgTagsElide()
 
     QQuickTextPrivate *textPrivate = QQuickTextPrivate::get(myText);
     QVERIFY(textPrivate != 0);
-    QVERIFY(textPrivate->extra->visibleImgTags.count() == 0);
+    QCOMPARE(textPrivate->extra->visibleImgTags.count(), 0);
     myText->setMaximumLineCount(20);
-    QTRY_VERIFY(textPrivate->extra->visibleImgTags.count() == 1);
+    QTRY_COMPARE(textPrivate->extra->visibleImgTags.count(), 1);
 
     delete myText;
     delete window;
@@ -2988,16 +2988,16 @@ void tst_qquicktext::imgTagsUpdates()
     QVERIFY(textPrivate != 0);
 
     myText->setText("This is a heart<img src=\"images/heart200.png\">.");
-    QVERIFY(textPrivate->extra->visibleImgTags.count() == 1);
-    QVERIFY(spy.count() == 1);
+    QCOMPARE(textPrivate->extra->visibleImgTags.count(), 1);
+    QCOMPARE(spy.count(), 1);
 
     myText->setMaximumLineCount(2);
     myText->setText("This is another heart<img src=\"images/heart200.png\">.");
-    QTRY_VERIFY(textPrivate->extra->visibleImgTags.count() == 1);
+    QTRY_COMPARE(textPrivate->extra->visibleImgTags.count(), 1);
 
     // if maximumLineCount is set and the img tag doesn't have an explicit size
     // we relayout twice.
-    QVERIFY(spy.count() == 3);
+    QCOMPARE(spy.count(), 3);
 
     delete myText;
     delete window;
diff --git a/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp b/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp
index 5a9ce2f6d7..5ec8fa2e83 100644
--- a/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp
+++ b/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp
@@ -577,7 +577,7 @@ void tst_qquicktextedit::textFormat()
         QQuickTextEdit *textObject = qobject_cast<QQuickTextEdit*>(textComponent.create());
 
         QVERIFY(textObject != 0);
-        QVERIFY(textObject->textFormat() == QQuickTextEdit::RichText);
+        QCOMPARE(textObject->textFormat(), QQuickTextEdit::RichText);
     }
     {
         QQmlComponent textComponent(&engine);
@@ -585,7 +585,7 @@ void tst_qquicktextedit::textFormat()
         QQuickTextEdit *textObject = qobject_cast<QQuickTextEdit*>(textComponent.create());
 
         QVERIFY(textObject != 0);
-        QVERIFY(textObject->textFormat() == QQuickTextEdit::PlainText);
+        QCOMPARE(textObject->textFormat(), QQuickTextEdit::PlainText);
     }
     {
         QQmlComponent component(&engine);
@@ -802,7 +802,7 @@ void tst_qquicktextedit::hAlign_RightToLeft()
     // keyboard input direction from qApp->inputMethod()->inputDirection
     textEdit->setText("");
     platformInputContext.setInputDirection(Qt::LeftToRight);
-    QVERIFY(qApp->inputMethod()->inputDirection() == Qt::LeftToRight);
+    QCOMPARE(qApp->inputMethod()->inputDirection(), Qt::LeftToRight);
     QCOMPARE(textEdit->hAlign(), QQuickTextEdit::AlignLeft);
     QVERIFY(textEdit->positionToRectangle(0).x() < window.width()/2);
 
@@ -810,7 +810,7 @@ void tst_qquicktextedit::hAlign_RightToLeft()
 
     platformInputContext.setInputDirection(Qt::RightToLeft);
     QCOMPARE(cursorRectangleSpy.count(), 1);
-    QVERIFY(qApp->inputMethod()->inputDirection() == Qt::RightToLeft);
+    QCOMPARE(qApp->inputMethod()->inputDirection(), Qt::RightToLeft);
     QCOMPARE(textEdit->hAlign(), QQuickTextEdit::AlignRight);
     QVERIFY(textEdit->positionToRectangle(0).x() > window.width()/2);
 
@@ -1401,22 +1401,22 @@ void tst_qquicktextedit::selection()
     }
 
     textEditObject->setCursorPosition(0);
-    QVERIFY(textEditObject->cursorPosition() == 0);
-    QVERIFY(textEditObject->selectionStart() == 0);
-    QVERIFY(textEditObject->selectionEnd() == 0);
+    QCOMPARE(textEditObject->cursorPosition(), 0);
+    QCOMPARE(textEditObject->selectionStart(), 0);
+    QCOMPARE(textEditObject->selectionEnd(), 0);
     QVERIFY(textEditObject->selectedText().isNull());
 
     // Verify invalid positions are ignored.
     textEditObject->setCursorPosition(-1);
-    QVERIFY(textEditObject->cursorPosition() == 0);
-    QVERIFY(textEditObject->selectionStart() == 0);
-    QVERIFY(textEditObject->selectionEnd() == 0);
+    QCOMPARE(textEditObject->cursorPosition(), 0);
+    QCOMPARE(textEditObject->selectionStart(), 0);
+    QCOMPARE(textEditObject->selectionEnd(), 0);
     QVERIFY(textEditObject->selectedText().isNull());
 
     textEditObject->setCursorPosition(textEditObject->text().count()+1);
-    QVERIFY(textEditObject->cursorPosition() == 0);
-    QVERIFY(textEditObject->selectionStart() == 0);
-    QVERIFY(textEditObject->selectionEnd() == 0);
+    QCOMPARE(textEditObject->cursorPosition(), 0);
+    QCOMPARE(textEditObject->selectionStart(), 0);
+    QCOMPARE(textEditObject->selectionEnd(), 0);
     QVERIFY(textEditObject->selectedText().isNull());
 
     //Test selection
@@ -1430,9 +1430,9 @@ void tst_qquicktextedit::selection()
     }
 
     textEditObject->setCursorPosition(0);
-    QVERIFY(textEditObject->cursorPosition() == 0);
-    QVERIFY(textEditObject->selectionStart() == 0);
-    QVERIFY(textEditObject->selectionEnd() == 0);
+    QCOMPARE(textEditObject->cursorPosition(), 0);
+    QCOMPARE(textEditObject->selectionStart(), 0);
+    QCOMPARE(textEditObject->selectionEnd(), 0);
     QVERIFY(textEditObject->selectedText().isNull());
 
     //Test Error Ignoring behaviour
@@ -1447,20 +1447,20 @@ void tst_qquicktextedit::selection()
     textEditObject->select(0,100);
     QVERIFY(textEditObject->selectedText().isNull());
     textEditObject->select(0,10);
-    QVERIFY(textEditObject->selectedText().size() == 10);
+    QCOMPARE(textEditObject->selectedText().size(), 10);
     textEditObject->select(-10,0);
-    QVERIFY(textEditObject->selectedText().size() == 10);
+    QCOMPARE(textEditObject->selectedText().size(), 10);
     textEditObject->select(100,101);
-    QVERIFY(textEditObject->selectedText().size() == 10);
+    QCOMPARE(textEditObject->selectedText().size(), 10);
     textEditObject->select(0,-10);
-    QVERIFY(textEditObject->selectedText().size() == 10);
+    QCOMPARE(textEditObject->selectedText().size(), 10);
     textEditObject->select(0,100);
-    QVERIFY(textEditObject->selectedText().size() == 10);
+    QCOMPARE(textEditObject->selectedText().size(), 10);
 
     textEditObject->deselect();
     QVERIFY(textEditObject->selectedText().isNull());
     textEditObject->select(0,10);
-    QVERIFY(textEditObject->selectedText().size() == 10);
+    QCOMPARE(textEditObject->selectedText().size(), 10);
     textEditObject->deselect();
     QVERIFY(textEditObject->selectedText().isNull());
 }
@@ -3223,15 +3223,15 @@ void tst_qquicktextedit::pastingRichText_QTBUG_14003()
     QQuickTextEdit *obj = qobject_cast<QQuickTextEdit*>(component.create());
 
     QTRY_VERIFY(obj != 0);
-    QTRY_VERIFY(obj->textFormat() == QQuickTextEdit::PlainText);
+    QTRY_COMPARE(obj->textFormat(), QQuickTextEdit::PlainText);
 
     QMimeData *mData = new QMimeData;
     mData->setHtml("<font color=\"red\">Hello</font>");
     QGuiApplication::clipboard()->setMimeData(mData);
 
     obj->paste();
-    QTRY_VERIFY(obj->text() == "");
-    QTRY_VERIFY(obj->textFormat() == QQuickTextEdit::PlainText);
+    QTRY_COMPARE(obj->text(), QString());
+    QTRY_COMPARE(obj->textFormat(), QQuickTextEdit::PlainText);
 }
 #endif
 
@@ -3257,11 +3257,11 @@ void tst_qquicktextedit::implicitSize()
     QQuickTextEdit *textObject = qobject_cast<QQuickTextEdit*>(textComponent.create());
 
     QVERIFY(textObject->width() < textObject->implicitWidth());
-    QVERIFY(textObject->height() == textObject->implicitHeight());
+    QCOMPARE(textObject->height(), textObject->implicitHeight());
 
     textObject->resetWidth();
-    QVERIFY(textObject->width() == textObject->implicitWidth());
-    QVERIFY(textObject->height() == textObject->implicitHeight());
+    QCOMPARE(textObject->width(), textObject->implicitWidth());
+    QCOMPARE(textObject->height(), textObject->implicitHeight());
 }
 
 void tst_qquicktextedit::contentSize()
@@ -3329,7 +3329,7 @@ void tst_qquicktextedit::signal_editingfinished()
     window->show();
     window->requestActivate();
     QVERIFY(QTest::qWaitForWindowActive(window));
-    QVERIFY(QGuiApplication::focusWindow() == window);
+    QCOMPARE(QGuiApplication::focusWindow(), window);
 
     QVERIFY(window->rootObject() != 0);
 
diff --git a/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp b/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp
index 3e4d2c658e..9682070162 100644
--- a/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp
+++ b/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp
@@ -593,7 +593,7 @@ void tst_qquicktextinput::wrap()
         textHeight = textObject->height();
 
         QVERIFY(textObject != 0);
-        QVERIFY(textObject->wrapMode() == QQuickTextInput::WrapAnywhere);
+        QCOMPARE(textObject->wrapMode(), QQuickTextInput::WrapAnywhere);
         QCOMPARE(textObject->width(), 300.);
 
         delete textObject;
@@ -660,22 +660,22 @@ void tst_qquicktextinput::selection()
     }
 
     textinputObject->setCursorPosition(0);
-    QVERIFY(textinputObject->cursorPosition() == 0);
-    QVERIFY(textinputObject->selectionStart() == 0);
-    QVERIFY(textinputObject->selectionEnd() == 0);
+    QCOMPARE(textinputObject->cursorPosition(), 0);
+    QCOMPARE(textinputObject->selectionStart(), 0);
+    QCOMPARE(textinputObject->selectionEnd(), 0);
     QVERIFY(textinputObject->selectedText().isNull());
 
     // Verify invalid positions are ignored.
     textinputObject->setCursorPosition(-1);
-    QVERIFY(textinputObject->cursorPosition() == 0);
-    QVERIFY(textinputObject->selectionStart() == 0);
-    QVERIFY(textinputObject->selectionEnd() == 0);
+    QCOMPARE(textinputObject->cursorPosition(), 0);
+    QCOMPARE(textinputObject->selectionStart(), 0);
+    QCOMPARE(textinputObject->selectionEnd(), 0);
     QVERIFY(textinputObject->selectedText().isNull());
 
     textinputObject->setCursorPosition(textinputObject->text().count()+1);
-    QVERIFY(textinputObject->cursorPosition() == 0);
-    QVERIFY(textinputObject->selectionStart() == 0);
-    QVERIFY(textinputObject->selectionEnd() == 0);
+    QCOMPARE(textinputObject->cursorPosition(), 0);
+    QCOMPARE(textinputObject->selectionStart(), 0);
+    QCOMPARE(textinputObject->selectionEnd(), 0);
     QVERIFY(textinputObject->selectedText().isNull());
 
     //Test selection
@@ -689,9 +689,9 @@ void tst_qquicktextinput::selection()
     }
 
     textinputObject->setCursorPosition(0);
-    QVERIFY(textinputObject->cursorPosition() == 0);
-    QVERIFY(textinputObject->selectionStart() == 0);
-    QVERIFY(textinputObject->selectionEnd() == 0);
+    QCOMPARE(textinputObject->cursorPosition(), 0);
+    QCOMPARE(textinputObject->selectionStart(), 0);
+    QCOMPARE(textinputObject->selectionEnd(), 0);
     QVERIFY(textinputObject->selectedText().isNull());
 
     //Test Error Ignoring behaviour
@@ -706,20 +706,20 @@ void tst_qquicktextinput::selection()
     textinputObject->select(0,100);
     QVERIFY(textinputObject->selectedText().isNull());
     textinputObject->select(0,10);
-    QVERIFY(textinputObject->selectedText().size() == 10);
+    QCOMPARE(textinputObject->selectedText().size(), 10);
     textinputObject->select(-10,10);
-    QVERIFY(textinputObject->selectedText().size() == 10);
+    QCOMPARE(textinputObject->selectedText().size(), 10);
     textinputObject->select(100,101);
-    QVERIFY(textinputObject->selectedText().size() == 10);
+    QCOMPARE(textinputObject->selectedText().size(), 10);
     textinputObject->select(0,-10);
-    QVERIFY(textinputObject->selectedText().size() == 10);
+    QCOMPARE(textinputObject->selectedText().size(), 10);
     textinputObject->select(0,100);
-    QVERIFY(textinputObject->selectedText().size() == 10);
+    QCOMPARE(textinputObject->selectedText().size(), 10);
 
     textinputObject->deselect();
     QVERIFY(textinputObject->selectedText().isNull());
     textinputObject->select(0,10);
-    QVERIFY(textinputObject->selectedText().size() == 10);
+    QCOMPARE(textinputObject->selectedText().size(), 10);
     textinputObject->deselect();
     QVERIFY(textinputObject->selectedText().isNull());
 
@@ -1515,13 +1515,13 @@ void tst_qquicktextinput::horizontalAlignment_RightToLeft()
     // keyboard input direction from QInputMethod::inputDirection()
     textInput->setText("");
     platformInputContext.setInputDirection(Qt::LeftToRight);
-    QVERIFY(qApp->inputMethod()->inputDirection() == Qt::LeftToRight);
+    QCOMPARE(qApp->inputMethod()->inputDirection(), Qt::LeftToRight);
     QCOMPARE(textInput->hAlign(), QQuickTextInput::AlignLeft);
     QCOMPARE(textInput->boundingRect().left(), qreal(0));
 
     QSignalSpy cursorRectangleSpy(textInput, SIGNAL(cursorRectangleChanged()));
     platformInputContext.setInputDirection(Qt::RightToLeft);
-    QVERIFY(qApp->inputMethod()->inputDirection() == Qt::RightToLeft);
+    QCOMPARE(qApp->inputMethod()->inputDirection(), Qt::RightToLeft);
     QCOMPARE(cursorRectangleSpy.count(), 1);
     QCOMPARE(textInput->hAlign(), QQuickTextInput::AlignRight);
     QVERIFY(textInput->boundingRect().right() >= textInput->width() - 1);
@@ -1855,7 +1855,7 @@ void tst_qquicktextinput::maxLength()
     QQuickTextInput *textinputObject = qobject_cast<QQuickTextInput *>(window.rootObject());
     QVERIFY(textinputObject != 0);
     QVERIFY(textinputObject->text().isEmpty());
-    QVERIFY(textinputObject->maxLength() == 10);
+    QCOMPARE(textinputObject->maxLength(), 10);
     foreach (const QString &str, standard) {
         QVERIFY(textinputObject->text().length() <= 10);
         textinputObject->setText(str);
@@ -1883,7 +1883,7 @@ void tst_qquicktextinput::masks()
     QQuickTextInput *textinputObject = qobject_cast<QQuickTextInput *>(window.rootObject());
     QVERIFY(textinputObject != 0);
     QTRY_VERIFY(textinputObject->hasActiveFocus());
-    QVERIFY(textinputObject->text().length() == 0);
+    QCOMPARE(textinputObject->text().length(), 0);
     QCOMPARE(textinputObject->inputMask(), QString("HHHHhhhh; "));
     QCOMPARE(textinputObject->length(), 8);
     for (int i=0; i<10; i++) {
@@ -2411,8 +2411,8 @@ void tst_qquicktextinput::navigation()
     input->select(0,input->text().length());
     QVERIFY(input->selectionStart() != input->selectionEnd());
     simulateKey(&window, Qt::Key_Right);
-    QVERIFY(input->selectionStart() == input->selectionEnd());
-    QVERIFY(input->selectionStart() == input->text().length());
+    QCOMPARE(input->selectionStart(), input->selectionEnd());
+    QCOMPARE(input->selectionStart(), input->text().length());
     QVERIFY(input->hasActiveFocus());
     simulateKey(&window, Qt::Key_Right);
     QVERIFY(!input->hasActiveFocus());
@@ -5830,11 +5830,11 @@ void tst_qquicktextinput::implicitSize()
     QQuickTextInput *textObject = qobject_cast<QQuickTextInput*>(textComponent.create());
 
     QVERIFY(textObject->width() < textObject->implicitWidth());
-    QVERIFY(textObject->height() == textObject->implicitHeight());
+    QCOMPARE(textObject->height(), textObject->implicitHeight());
 
     textObject->resetWidth();
-    QVERIFY(textObject->width() == textObject->implicitWidth());
-    QVERIFY(textObject->height() == textObject->implicitHeight());
+    QCOMPARE(textObject->width(), textObject->implicitWidth());
+    QCOMPARE(textObject->height(), textObject->implicitHeight());
 }
 
 void tst_qquicktextinput::implicitSizeBinding_data()
diff --git a/tests/auto/quick/qquickview/tst_qquickview.cpp b/tests/auto/quick/qquickview/tst_qquickview.cpp
index 7ee24bf3d4..2f054e278a 100644
--- a/tests/auto/quick/qquickview/tst_qquickview.cpp
+++ b/tests/auto/quick/qquickview/tst_qquickview.cpp
@@ -184,16 +184,16 @@ void tst_QQuickView::errors()
         QQuickView view;
         QQmlTestMessageHandler messageHandler;
         view.setSource(testFileUrl("error1.qml"));
-        QVERIFY(view.status() == QQuickView::Error);
-        QVERIFY(view.errors().count() == 1);
+        QCOMPARE(view.status(), QQuickView::Error);
+        QCOMPARE(view.errors().count(), 1);
     }
 
     {
         QQuickView view;
         QQmlTestMessageHandler messageHandler;
         view.setSource(testFileUrl("error2.qml"));
-        QVERIFY(view.status() == QQuickView::Error);
-        QVERIFY(view.errors().count() == 1);
+        QCOMPARE(view.status(), QQuickView::Error);
+        QCOMPARE(view.errors().count(), 1);
         view.show();
     }
 }
@@ -205,16 +205,16 @@ void tst_QQuickView::engine()
 
     QQuickView *view = new QQuickView(engine, 0);
     QVERIFY(view);
-    QVERIFY(engine->incubationController() == view->incubationController());
+    QCOMPARE(engine->incubationController(), view->incubationController());
 
     QQuickView *view2 = new QQuickView(engine, 0);
     QVERIFY(view);
-    QVERIFY(engine->incubationController() == view->incubationController());
+    QCOMPARE(engine->incubationController(), view->incubationController());
     delete view;
     QVERIFY(!engine->incubationController());
 
     engine->setIncubationController(view2->incubationController());
-    QVERIFY(engine->incubationController() == view2->incubationController());
+    QCOMPARE(engine->incubationController(), view2->incubationController());
     delete view2;
     QVERIFY(!engine->incubationController());
 
diff --git a/tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp b/tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp
index 2dd9e77370..d578a0900c 100644
--- a/tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp
+++ b/tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp
@@ -513,15 +513,15 @@ void tst_qquickvisualdatamodel::rootIndex()
     QVERIFY(obj != 0);
 
     QMetaObject::invokeMethod(obj, "setRoot");
-    QVERIFY(qvariant_cast<QModelIndex>(obj->rootIndex()) == model.index(0,0));
+    QCOMPARE(qvariant_cast<QModelIndex>(obj->rootIndex()), model.index(0,0));
 
     QMetaObject::invokeMethod(obj, "setRootToParent");
-    QVERIFY(qvariant_cast<QModelIndex>(obj->rootIndex()) == QModelIndex());
+    QCOMPARE(qvariant_cast<QModelIndex>(obj->rootIndex()), QModelIndex());
 
     QMetaObject::invokeMethod(obj, "setRoot");
-    QVERIFY(qvariant_cast<QModelIndex>(obj->rootIndex()) == model.index(0,0));
+    QCOMPARE(qvariant_cast<QModelIndex>(obj->rootIndex()), model.index(0,0));
     model.clear(); // will emit modelReset()
-    QVERIFY(qvariant_cast<QModelIndex>(obj->rootIndex()) == QModelIndex());
+    QCOMPARE(qvariant_cast<QModelIndex>(obj->rootIndex()), QModelIndex());
 
     delete obj;
 }
@@ -628,7 +628,7 @@ void tst_qquickvisualdatamodel::childChanged()
 
     model.item(1,0)->takeRow(1);
     name = findItem<QQuickText>(contentItem, "display", 1);
-    QVERIFY(name == 0);
+    QVERIFY(!name);
 
     vdm->setRootIndex(QVariant::fromValue(QModelIndex()));
     QCOMPARE(listview->count(), 3);
diff --git a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
index 51a80ea0e9..2c7a3c933b 100644
--- a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
+++ b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
@@ -978,7 +978,7 @@ void tst_qquickwindow::clearWindow()
 
     delete window;
 
-    QVERIFY(item->window() == 0);
+    QVERIFY(!item->window());
 
     delete item;
 }
@@ -1232,7 +1232,7 @@ void tst_qquickwindow::headless()
 
     if (threaded) {
         QTRY_COMPARE(invalidated.size(), 1);
-        QVERIFY(window->openglContext() == 0);
+        QVERIFY(!window->openglContext());
     }
 
     if (QGuiApplication::platformName() == QLatin1String("windows")
@@ -1242,7 +1242,7 @@ void tst_qquickwindow::headless()
 
     // Destroy the native windowing system buffers
     window->destroy();
-    QVERIFY(window->handle() == 0);
+    QVERIFY(!window->handle());
 
     // Show and verify that we are back and running
     window->show();
@@ -1609,7 +1609,7 @@ void tst_qquickwindow::hideThenDelete()
                 if (!persistentGL)
                     QVERIFY(openglDestroyed->size() > 0);
                 else
-                    QVERIFY(openglDestroyed->size() == 0);
+                    QCOMPARE(openglDestroyed->size(), 0);
             } else {
                 QCOMPARE(sgInvalidated->size(), 0);
                 QCOMPARE(openglDestroyed->size(), 0);
diff --git a/tests/auto/quick/qquickxmllistmodel/tst_qquickxmllistmodel.cpp b/tests/auto/quick/qquickxmllistmodel/tst_qquickxmllistmodel.cpp
index 5372a4d3b3..c0bf86a212 100644
--- a/tests/auto/quick/qquickxmllistmodel/tst_qquickxmllistmodel.cpp
+++ b/tests/auto/quick/qquickxmllistmodel/tst_qquickxmllistmodel.cpp
@@ -760,9 +760,9 @@ void tst_qquickxmllistmodel::noKeysValueChanges()
     QTRY_VERIFY(model->data(model->index(0, 0), roles.at(2)).toString() != QLatin1String("Football"));
     QCOMPARE(model->data(model->index(0, 0), roles.at(2)).toString(), QLatin1String("AussieRules"));
 
-    QVERIFY(spyInsert.count() == 0);
-    QVERIFY(spyRemove.count() == 0);
-    QVERIFY(spyCount.count() == 0);
+    QCOMPARE(spyInsert.count(), 0);
+    QCOMPARE(spyRemove.count(), 0);
+    QCOMPARE(spyCount.count(), 0);
 
     QCOMPARE(model->rowCount(), 2);
 
@@ -940,7 +940,7 @@ void tst_qquickxmllistmodel::propertyChanges()
     QCOMPARE(model->property("query").toString(), QString("/Pets"));
     QCOMPARE(model->property("namespaceDeclarations").toString(), QString("declare namespace media=\"http://search.yahoo.com/mrss/\";"));
 
-    QTRY_VERIFY(model->rowCount() == 1);
+    QTRY_COMPARE(model->rowCount(), 1);
 
     QCOMPARE(sourceSpy.count(),1);
     QCOMPARE(xmlSpy.count(),1);
@@ -957,7 +957,7 @@ void tst_qquickxmllistmodel::propertyChanges()
     QCOMPARE(modelQuerySpy.count(),1);
     QCOMPARE(namespaceDeclarationsSpy.count(),1);
 
-    QTRY_VERIFY(model->rowCount() == 1);
+    QTRY_COMPARE(model->rowCount(), 1);
     delete model;
 }
 
diff --git a/tests/auto/quick/touchmouse/tst_touchmouse.cpp b/tests/auto/quick/touchmouse/tst_touchmouse.cpp
index 539bbb4703..90ee8215a1 100644
--- a/tests/auto/quick/touchmouse/tst_touchmouse.cpp
+++ b/tests/auto/quick/touchmouse/tst_touchmouse.cpp
@@ -863,7 +863,7 @@ void tst_TouchMouse::pinchOnFlickable()
     QVERIFY(rect);
 
     // flickable - single touch point
-    QVERIFY(flickable->contentX() == 0.0);
+    QCOMPARE(flickable->contentX(), 0.0);
     QPoint p = QPoint(100, 100);
     QTest::touchEvent(window, device).press(0, p, window);
     QQuickTouchUtils::flush(window);
@@ -945,7 +945,7 @@ void tst_TouchMouse::flickableOnPinch()
     QVERIFY(rect);
 
     // flickable - single touch point
-    QVERIFY(flickable->contentX() == 0.0);
+    QCOMPARE(flickable->contentX(), 0.0);
     QPoint p = QPoint(100, 100);
     QTest::touchEvent(window, device).press(0, p, window);
     QQuickTouchUtils::flush(window);
@@ -1025,7 +1025,7 @@ void tst_TouchMouse::mouseOnFlickableOnPinch()
     QVERIFY(rect);
 
     // flickable - single touch point
-    QVERIFY(flickable->contentX() == 0.0);
+    QCOMPARE(flickable->contentX(), 0.0);
     QPoint p = QPoint(100, 100);
     QTest::touchEvent(window, device).press(0, p, window);
     QQuickTouchUtils::flush(window);
diff --git a/tests/auto/quickwidgets/qquickwidget/tst_qquickwidget.cpp b/tests/auto/quickwidgets/qquickwidget/tst_qquickwidget.cpp
index 3da920ca27..11696e288f 100644
--- a/tests/auto/quickwidgets/qquickwidget/tst_qquickwidget.cpp
+++ b/tests/auto/quickwidgets/qquickwidget/tst_qquickwidget.cpp
@@ -226,8 +226,8 @@ void tst_qquickwidget::errors()
 
     QQmlTestMessageHandler messageHandler;
     view->setSource(testFileUrl("error1.qml"));
-    QVERIFY(view->status() == QQuickWidget::Error);
-    QVERIFY(view->errors().count() == 1);
+    QCOMPARE(view->status(), QQuickWidget::Error);
+    QCOMPARE(view->errors().count(), 1);
 }
 
 void tst_qquickwidget::engine()