tests/auto/widgets: 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: Ie29640451dddeb58342038a8cd5fac152cce39e5
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>

10 files changed, 115 insertions, 115 deletions

diff --git a/tests/auto/widgets/kernel/qaction/tst_qaction.cpp b/tests/auto/widgets/kernel/qaction/tst_qaction.cpp
index 897128d40e..71b55d71ea 100644
--- a/tests/auto/widgets/kernel/qaction/tst_qaction.cpp
+++ b/tests/auto/widgets/kernel/qaction/tst_qaction.cpp
@@ -242,7 +242,7 @@ void tst_QAction::setStandardKeys()
     QList<QKeySequence> list;
     act.setShortcuts(list);
     act.setShortcuts(QKeySequence::Copy);
-    QVERIFY(act.shortcut() == act.shortcuts().first());
+    QCOMPARE(act.shortcut(), act.shortcuts().first());
 
     QList<QKeySequence> expected;
     const QKeySequence ctrlC = QKeySequence(QStringLiteral("CTRL+C"));
diff --git a/tests/auto/widgets/kernel/qactiongroup/tst_qactiongroup.cpp b/tests/auto/widgets/kernel/qactiongroup/tst_qactiongroup.cpp
index 5e5d15841a..81e5542e91 100644
--- a/tests/auto/widgets/kernel/qactiongroup/tst_qactiongroup.cpp
+++ b/tests/auto/widgets/kernel/qactiongroup/tst_qactiongroup.cpp
@@ -224,7 +224,7 @@ void tst_QActionGroup::unCheckCurrentAction()
     current->setChecked(false);
     QVERIFY(!action1.isChecked());
     QVERIFY(!action2.isChecked());
-    QVERIFY(group.checkedAction() == 0);
+    QVERIFY(!group.checkedAction());
 }
 
 
diff --git a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
index 964c98741b..878136b4a0 100644
--- a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
+++ b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
@@ -1158,7 +1158,7 @@ void tst_QApplication::sendPostedEvents()
     QMetaObject::invokeMethod(&app, "quit", Qt::QueuedConnection);
     QPointer<SendPostedEventsTester> p = tester;
     (void) app.exec();
-    QVERIFY(p == 0);
+    QVERIFY(p.isNull());
 }
 
 void tst_QApplication::thread()
@@ -1176,8 +1176,8 @@ void tst_QApplication::thread()
     // *before* the QApplication has a thread
     QObject object;
     QObject child(&object);
-    QVERIFY(object.thread() == currentThread);
-    QVERIFY(child.thread() == currentThread);
+    QCOMPARE(object.thread(), currentThread);
+    QCOMPARE(child.thread(), currentThread);
 
     {
         int argc = 0;
@@ -1207,8 +1207,8 @@ void tst_QApplication::thread()
     QVERIFY(!currentThread->isFinished());
 
     // should still have a thread
-    QVERIFY(object.thread() == currentThread);
-    QVERIFY(child.thread() == currentThread);
+    QCOMPARE(object.thread(), currentThread);
+    QCOMPARE(child.thread(), currentThread);
 
     // do the test again, making sure that the thread is the same as
     // before
@@ -1229,8 +1229,8 @@ void tst_QApplication::thread()
         QVERIFY(!currentThread->isFinished());
 
         // should still have a thread
-        QVERIFY(object.thread() == currentThread);
-        QVERIFY(child.thread() == currentThread);
+        QCOMPARE(object.thread(), currentThread);
+        QCOMPARE(child.thread(), currentThread);
 
         QTestEventLoop::instance().enterLoop(1);
     }
@@ -1244,8 +1244,8 @@ void tst_QApplication::thread()
     QVERIFY(!currentThread->isFinished());
 
     // should still have a thread
-    QVERIFY(object.thread() == currentThread);
-    QVERIFY(child.thread() == currentThread);
+    QCOMPARE(object.thread(), currentThread);
+    QCOMPARE(child.thread(), currentThread);
 }
 
 class DeleteLaterWidget : public QWidget
@@ -1559,9 +1559,9 @@ void tst_QApplication::focusChanged()
     QCOMPARE(spy.at(0).count(), 2);
     old = qvariant_cast<QWidget*>(spy.at(0).at(0));
     now = qvariant_cast<QWidget*>(spy.at(0).at(1));
-    QVERIFY(now == &le1);
-    QVERIFY(now == QApplication::focusWidget());
-    QVERIFY(old == 0);
+    QCOMPARE(now, &le1);
+    QCOMPARE(now, QApplication::focusWidget());
+    QVERIFY(!old);
     spy.clear();
     QCOMPARE(spy.count(), 0);
 
@@ -1569,27 +1569,27 @@ void tst_QApplication::focusChanged()
     QCOMPARE(spy.count(), 1);
     old = qvariant_cast<QWidget*>(spy.at(0).at(0));
     now = qvariant_cast<QWidget*>(spy.at(0).at(1));
-    QVERIFY(now == &pb1);
-    QVERIFY(now == QApplication::focusWidget());
-    QVERIFY(old == &le1);
+    QCOMPARE(now, &pb1);
+    QCOMPARE(now, QApplication::focusWidget());
+    QCOMPARE(old, &le1);
     spy.clear();
 
     lb1.setFocus();
     QCOMPARE(spy.count(), 1);
     old = qvariant_cast<QWidget*>(spy.at(0).at(0));
     now = qvariant_cast<QWidget*>(spy.at(0).at(1));
-    QVERIFY(now == &lb1);
-    QVERIFY(now == QApplication::focusWidget());
-    QVERIFY(old == &pb1);
+    QCOMPARE(now, &lb1);
+    QCOMPARE(now, QApplication::focusWidget());
+    QCOMPARE(old, &pb1);
     spy.clear();
 
     lb1.clearFocus();
     QCOMPARE(spy.count(), 1);
     old = qvariant_cast<QWidget*>(spy.at(0).at(0));
     now = qvariant_cast<QWidget*>(spy.at(0).at(1));
-    QVERIFY(now == 0);
-    QVERIFY(now == QApplication::focusWidget());
-    QVERIFY(old == &lb1);
+    QVERIFY(!now);
+    QCOMPARE(now, QApplication::focusWidget());
+    QCOMPARE(old, &lb1);
     spy.clear();
 
     QWidget parent2;
@@ -1606,9 +1606,9 @@ void tst_QApplication::focusChanged()
     QVERIFY(spy.count() > 0); // one for deactivation, one for activation on Windows
     old = qvariant_cast<QWidget*>(spy.at(spy.count()-1).at(0));
     now = qvariant_cast<QWidget*>(spy.at(spy.count()-1).at(1));
-    QVERIFY(now == &le2);
-    QVERIFY(now == QApplication::focusWidget());
-    QVERIFY(old == 0);
+    QCOMPARE(now, &le2);
+    QCOMPARE(now, QApplication::focusWidget());
+    QVERIFY(!old);
     spy.clear();
 
     QTestKeyEvent tab(QTest::Press, Qt::Key_Tab, 0, 0);
@@ -1630,82 +1630,82 @@ void tst_QApplication::focusChanged()
 
     tab.simulate(now);
     if (!tabAllControls) {
-        QVERIFY(spy.count() == 0);
-        QVERIFY(now == QApplication::focusWidget());
+        QCOMPARE(spy.count(), 0);
+        QCOMPARE(now, QApplication::focusWidget());
     } else {
         QVERIFY(spy.count() > 0);
         old = qvariant_cast<QWidget*>(spy.at(0).at(0));
         now = qvariant_cast<QWidget*>(spy.at(0).at(1));
-        QVERIFY(now == &pb2);
-        QVERIFY(now == QApplication::focusWidget());
-        QVERIFY(old == &le2);
+        QCOMPARE(now, &pb2);
+        QCOMPARE(now, QApplication::focusWidget());
+        QCOMPARE(old, &le2);
         spy.clear();
     }
 
     if (!tabAllControls) {
-        QVERIFY(spy.count() == 0);
-        QVERIFY(now == QApplication::focusWidget());
+        QCOMPARE(spy.count(), 0);
+        QCOMPARE(now, QApplication::focusWidget());
     } else {
         tab.simulate(now);
         QVERIFY(spy.count() > 0);
         old = qvariant_cast<QWidget*>(spy.at(0).at(0));
         now = qvariant_cast<QWidget*>(spy.at(0).at(1));
-        QVERIFY(now == &le2);
-        QVERIFY(now == QApplication::focusWidget());
-        QVERIFY(old == &pb2);
+        QCOMPARE(now, &le2);
+        QCOMPARE(now, QApplication::focusWidget());
+        QCOMPARE(old, &pb2);
         spy.clear();
     }
 
     if (!tabAllControls) {
-        QVERIFY(spy.count() == 0);
-        QVERIFY(now == QApplication::focusWidget());
+        QCOMPARE(spy.count(), 0);
+        QCOMPARE(now, QApplication::focusWidget());
     } else {
         backtab.simulate(now);
         QVERIFY(spy.count() > 0);
         old = qvariant_cast<QWidget*>(spy.at(0).at(0));
         now = qvariant_cast<QWidget*>(spy.at(0).at(1));
-        QVERIFY(now == &pb2);
-        QVERIFY(now == QApplication::focusWidget());
-        QVERIFY(old == &le2);
+        QCOMPARE(now, &pb2);
+        QCOMPARE(now, QApplication::focusWidget());
+        QCOMPARE(old, &le2);
         spy.clear();
     }
 
 
     if (!tabAllControls) {
-        QVERIFY(spy.count() == 0);
-        QVERIFY(now == QApplication::focusWidget());
+        QCOMPARE(spy.count(), 0);
+        QCOMPARE(now, QApplication::focusWidget());
         old = &pb2;
     } else {
         backtab.simulate(now);
         QVERIFY(spy.count() > 0);
         old = qvariant_cast<QWidget*>(spy.at(0).at(0));
         now = qvariant_cast<QWidget*>(spy.at(0).at(1));
-        QVERIFY(now == &le2);
-        QVERIFY(now == QApplication::focusWidget());
-        QVERIFY(old == &pb2);
+        QCOMPARE(now, &le2);
+        QCOMPARE(now, QApplication::focusWidget());
+        QCOMPARE(old, &pb2);
         spy.clear();
     }
 
     click.simulate(old);
     if (!(pb2.focusPolicy() & Qt::ClickFocus)) {
-        QVERIFY(spy.count() == 0);
-        QVERIFY(now == QApplication::focusWidget());
+        QCOMPARE(spy.count(), 0);
+        QCOMPARE(now, QApplication::focusWidget());
     } else {
         QVERIFY(spy.count() > 0);
         old = qvariant_cast<QWidget*>(spy.at(0).at(0));
         now = qvariant_cast<QWidget*>(spy.at(0).at(1));
-        QVERIFY(now == &pb2);
-        QVERIFY(now == QApplication::focusWidget());
-        QVERIFY(old == &le2);
+        QCOMPARE(now, &pb2);
+        QCOMPARE(now, QApplication::focusWidget());
+        QCOMPARE(old, &le2);
         spy.clear();
 
         click.simulate(old);
         QVERIFY(spy.count() > 0);
         old = qvariant_cast<QWidget*>(spy.at(0).at(0));
         now = qvariant_cast<QWidget*>(spy.at(0).at(1));
-        QVERIFY(now == &le2);
-        QVERIFY(now == QApplication::focusWidget());
-        QVERIFY(old == &pb2);
+        QCOMPARE(now, &le2);
+        QCOMPARE(now, QApplication::focusWidget());
+        QCOMPARE(old, &pb2);
         spy.clear();
     }
 
@@ -1720,9 +1720,9 @@ void tst_QApplication::focusChanged()
     else
         old = qvariant_cast<QWidget*>(spy.at(spy.count()-2).at(0));
     now = qvariant_cast<QWidget*>(spy.at(spy.count()-1).at(1));
-    QVERIFY(now == &le1);
-    QVERIFY(now == QApplication::focusWidget());
-    QVERIFY(old == &le2);
+    QCOMPARE(now, &le1);
+    QCOMPARE(now, QApplication::focusWidget());
+    QCOMPARE(old, &le2);
     spy.clear();
 }
 
diff --git a/tests/auto/widgets/kernel/qboxlayout/tst_qboxlayout.cpp b/tests/auto/widgets/kernel/qboxlayout/tst_qboxlayout.cpp
index d935406ce8..aeaf1e7bf0 100644
--- a/tests/auto/widgets/kernel/qboxlayout/tst_qboxlayout.cpp
+++ b/tests/auto/widgets/kernel/qboxlayout/tst_qboxlayout.cpp
@@ -131,8 +131,8 @@ void tst_QBoxLayout::insertSpacerItem()
     layout->insertSpacerItem(0, spacer2);
     window.setLayout(layout);
 
-    QVERIFY(layout->itemAt(0) == spacer2);
-    QVERIFY(layout->itemAt(2) == spacer1);
+    QCOMPARE(layout->itemAt(0), spacer2);
+    QCOMPARE(layout->itemAt(2), spacer1);
 
     window.show();
 }
diff --git a/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp b/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp
index d99e50e875..e1b494c9f1 100644
--- a/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp
+++ b/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp
@@ -165,13 +165,13 @@ void tst_QFormLayout::buddies()
     QLineEdit *le2 = new QLineEdit;
     fl->addRow(0, le2);
     QWidget *label2 = fl->labelForField(le2);
-    QVERIFY(label2 == 0);
+    QVERIFY(!label2);
 
     //no label
     QLineEdit *le3 = new QLineEdit;
     fl->addRow(le3);
     QWidget *label3 = fl->labelForField(le3);
-    QVERIFY(label3 == 0);
+    QVERIFY(!label3);
 
     //TODO: empty label?
 }
@@ -389,18 +389,18 @@ void tst_QFormLayout::setFormStyle()
 #if 0 // QT_NO_STYLE_PLASTIQUE
     widget.setStyle(new QPlastiqueStyle());
 
-    QVERIFY(layout.labelAlignment() == Qt::AlignRight);
+    QCOMPARE(layout.labelAlignment(), Qt::AlignRight);
     QVERIFY(layout.formAlignment() == (Qt::AlignLeft | Qt::AlignTop));
-    QVERIFY(layout.fieldGrowthPolicy() == QFormLayout::ExpandingFieldsGrow);
-    QVERIFY(layout.rowWrapPolicy() == QFormLayout::DontWrapRows);
+    QCOMPARE(layout.fieldGrowthPolicy(), QFormLayout::ExpandingFieldsGrow);
+    QCOMPARE(layout.rowWrapPolicy(), QFormLayout::DontWrapRows);
 #endif
 
     widget.setStyle(QStyleFactory::create("windows"));
 
-    QVERIFY(layout.labelAlignment() == Qt::AlignLeft);
+    QCOMPARE(layout.labelAlignment(), Qt::AlignLeft);
     QVERIFY(layout.formAlignment() == (Qt::AlignLeft | Qt::AlignTop));
-    QVERIFY(layout.fieldGrowthPolicy() == QFormLayout::AllNonFixedFieldsGrow);
-    QVERIFY(layout.rowWrapPolicy() == QFormLayout::DontWrapRows);
+    QCOMPARE(layout.fieldGrowthPolicy(), QFormLayout::AllNonFixedFieldsGrow);
+    QCOMPARE(layout.rowWrapPolicy(), QFormLayout::DontWrapRows);
 
     /* can't directly create mac style or qtopia style, since
        this test is cross platform.. so create dummy styles that
@@ -408,17 +408,17 @@ void tst_QFormLayout::setFormStyle()
      */
     widget.setStyle(new DummyMacStyle());
 
-    QVERIFY(layout.labelAlignment() == Qt::AlignRight);
+    QCOMPARE(layout.labelAlignment(), Qt::AlignRight);
     QVERIFY(layout.formAlignment() == (Qt::AlignHCenter | Qt::AlignTop));
-    QVERIFY(layout.fieldGrowthPolicy() == QFormLayout::FieldsStayAtSizeHint);
-    QVERIFY(layout.rowWrapPolicy() == QFormLayout::DontWrapRows);
+    QCOMPARE(layout.fieldGrowthPolicy(), QFormLayout::FieldsStayAtSizeHint);
+    QCOMPARE(layout.rowWrapPolicy(), QFormLayout::DontWrapRows);
 
     widget.setStyle(new DummyQtopiaStyle());
 
-    QVERIFY(layout.labelAlignment() == Qt::AlignRight);
+    QCOMPARE(layout.labelAlignment(), Qt::AlignRight);
     QVERIFY(layout.formAlignment() == (Qt::AlignLeft | Qt::AlignTop));
-    QVERIFY(layout.fieldGrowthPolicy() == QFormLayout::AllNonFixedFieldsGrow);
-    QVERIFY(layout.rowWrapPolicy() == QFormLayout::WrapLongRows);
+    QCOMPARE(layout.fieldGrowthPolicy(), QFormLayout::AllNonFixedFieldsGrow);
+    QCOMPARE(layout.rowWrapPolicy(), QFormLayout::WrapLongRows);
 }
 
 void tst_QFormLayout::setFieldGrowthPolicy()
@@ -443,14 +443,14 @@ void tst_QFormLayout::setFieldGrowthPolicy()
         layout.activate();
 
         if (i == 0) {
-            QVERIFY(fld1.width() == fld2.width());
-            QVERIFY(fld2.width() == fld3.width());
+            QCOMPARE(fld1.width(), fld2.width());
+            QCOMPARE(fld2.width(), fld3.width());
         } else if (i == 1) {
-            QVERIFY(fld1.width() == fld2.width());
+            QCOMPARE(fld1.width(), fld2.width());
             QVERIFY(fld2.width() < fld3.width());
         } else {
             QVERIFY(fld1.width() < fld2.width());
-            QVERIFY(fld2.width() == fld3.width());
+            QCOMPARE(fld2.width(), fld3.width());
         }
     }
 }
@@ -639,17 +639,17 @@ void tst_QFormLayout::insertRow_QString_QWidget()
     layout->insertRow(-5, "&Name:", fld1);
     QLabel *label1 = qobject_cast<QLabel *>(layout->itemAt(0, QFormLayout::LabelRole)->widget());
     QVERIFY(label1 != 0);
-    QVERIFY(label1->buddy() == fld1);
+    QCOMPARE(label1->buddy(), fld1);
 
     layout->insertRow(0, "&Email:", fld2);
     QLabel *label2 = qobject_cast<QLabel *>(layout->itemAt(0, QFormLayout::LabelRole)->widget());
     QVERIFY(label2 != 0);
-    QVERIFY(label2->buddy() == fld2);
+    QCOMPARE(label2->buddy(), fld2);
 
     layout->insertRow(5, "&Age:", fld3);
     QLabel *label3 = qobject_cast<QLabel *>(layout->itemAt(2, QFormLayout::LabelRole)->widget());
     QVERIFY(label3 != 0);
-    QVERIFY(label3->buddy() == fld3);
+    QCOMPARE(label3->buddy(), fld3);
 }
 
 void tst_QFormLayout::insertRow_QString_QLayout()
@@ -663,21 +663,21 @@ void tst_QFormLayout::insertRow_QString_QLayout()
     layout->insertRow(-5, "&Name:", fld1);
     QLabel *label1 = qobject_cast<QLabel *>(layout->itemAt(0, QFormLayout::LabelRole)->widget());
     QVERIFY(label1 != 0);
-    QVERIFY(label1->buddy() == 0);
+    QVERIFY(!label1->buddy());
 
     QCOMPARE(layout->rowCount(), 1);
 
     layout->insertRow(0, "&Email:", fld2);
     QLabel *label2 = qobject_cast<QLabel *>(layout->itemAt(0, QFormLayout::LabelRole)->widget());
     QVERIFY(label2 != 0);
-    QVERIFY(label2->buddy() == 0);
+    QVERIFY(!label2->buddy());
 
     QCOMPARE(layout->rowCount(), 2);
 
     layout->insertRow(5, "&Age:", fld3);
     QLabel *label3 = qobject_cast<QLabel *>(layout->itemAt(2, QFormLayout::LabelRole)->widget());
     QVERIFY(label3 != 0);
-    QVERIFY(label3->buddy() == 0);
+    QVERIFY(!label3->buddy());
 
     QCOMPARE(layout->rowCount(), 3);
 }
diff --git a/tests/auto/widgets/kernel/qlayout/tst_qlayout.cpp b/tests/auto/widgets/kernel/qlayout/tst_qlayout.cpp
index 3bdd335fa6..4d15ac9a93 100644
--- a/tests/auto/widgets/kernel/qlayout/tst_qlayout.cpp
+++ b/tests/auto/widgets/kernel/qlayout/tst_qlayout.cpp
@@ -218,12 +218,12 @@ void tst_QLayout::setLayoutBugs()
     }
 
     widget.setLayout(hBoxLayout);
-    QVERIFY(widget.layout() == hBoxLayout);
+    QCOMPARE(widget.layout(), hBoxLayout);
 
     QWidget containerWidget(0);
     containerWidget.setLayout(widget.layout());
-    QVERIFY(widget.layout() == 0);
-    QVERIFY(containerWidget.layout() == hBoxLayout);
+    QVERIFY(!widget.layout());
+    QCOMPARE(containerWidget.layout(), hBoxLayout);
 }
 
 class MyLayout : public QLayout
diff --git a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
index c7ab14df4f..34bd575646 100644
--- a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
+++ b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
@@ -3373,7 +3373,7 @@ void tst_QWidget::widgetAt()
 #if defined(Q_OS_WINCE)
     QEXPECT_FAIL("", "Windows CE does only support rectangular regions", Continue); //See also task 147191
 #endif
-    QTRY_VERIFY(QApplication::widgetAt(testPos) == w1.data());
+    QTRY_COMPARE(QApplication::widgetAt(testPos), w1.data());
     QTRY_VERIFY(QApplication::widgetAt(testPos + QPoint(1, 1)) == w2.data());
 }
 
@@ -3420,24 +3420,24 @@ void tst_QWidget::testDeletionInEventHandlers()
     QPointer<Widget> w = new Widget;
     w->deleteThis = true;
     w->close();
-    QVERIFY(w == 0);
+    QVERIFY(w.isNull());
     delete w;
 
     // focusOut (crashes)
     //w = new Widget;
     //w->show();
     //w->setFocus();
-    //QVERIFY(qApp->focusWidget() == w);
+    //QCOMPARE(qApp->focusWidget(), w);
     //w->deleteThis = true;
     //w->clearFocus();
-    //QVERIFY(w == 0);
+    //QVERIFY(w.isNull());
 
     // key press
     w = new Widget;
     w->show();
     w->deleteThis = true;
     QTest::keyPress(w, Qt::Key_A);
-    QVERIFY(w == 0);
+    QVERIFY(w.isNull());
     delete w;
 
     // key release
@@ -3445,7 +3445,7 @@ void tst_QWidget::testDeletionInEventHandlers()
     w->show();
     w->deleteThis = true;
     QTest::keyRelease(w, Qt::Key_A);
-    QVERIFY(w == 0);
+    QVERIFY(w.isNull());
     delete w;
 
     // mouse press
@@ -3453,7 +3453,7 @@ void tst_QWidget::testDeletionInEventHandlers()
     w->show();
     w->deleteThis = true;
     QTest::mousePress(w, Qt::LeftButton);
-    QVERIFY(w == 0);
+    QVERIFY(w.isNull());
     delete w;
 
     // mouse release
@@ -3462,7 +3462,7 @@ void tst_QWidget::testDeletionInEventHandlers()
     w->deleteThis = true;
     QMouseEvent me(QEvent::MouseButtonRelease, QPoint(1, 1), Qt::LeftButton, Qt::LeftButton, 0);
     qApp->notify(w, &me);
-    QVERIFY(w == 0);
+    QVERIFY(w.isNull());
     delete w;
 
     // mouse double click
@@ -3470,7 +3470,7 @@ void tst_QWidget::testDeletionInEventHandlers()
     w->show();
     w->deleteThis = true;
     QTest::mouseDClick(w, Qt::LeftButton);
-    QVERIFY(w == 0);
+    QVERIFY(w.isNull());
     delete w;
 
     // hide event (crashes)
@@ -3478,13 +3478,13 @@ void tst_QWidget::testDeletionInEventHandlers()
     //w->show();
     //w->deleteThis = true;
     //w->hide();
-    //QVERIFY(w == 0);
+    //QVERIFY(w.isNull());
 
     // action event
     w = new Widget;
     w->deleteThis = true;
     w->addAction(new QAction(w));
-    QVERIFY(w == 0);
+    QVERIFY(w.isNull());
     delete w;
 
     // change event
@@ -3492,7 +3492,7 @@ void tst_QWidget::testDeletionInEventHandlers()
     w->show();
     w->deleteThis = true;
     w->setMouseTracking(true);
-    QVERIFY(w == 0);
+    QVERIFY(w.isNull());
     delete w;
 
     w = new Widget;
@@ -3501,7 +3501,7 @@ void tst_QWidget::testDeletionInEventHandlers()
     w->deleteThis = true;
     me = QMouseEvent(QEvent::MouseMove, QPoint(0, 0), Qt::NoButton, Qt::NoButton, Qt::NoModifier);
     QApplication::sendEvent(w, &me);
-    QVERIFY(w == 0);
+    QVERIFY(w.isNull());
     delete w;
 }
 
@@ -3931,7 +3931,7 @@ void tst_QWidget::winIdChangeEvent()
         QCOMPARE(winIdBefore, winIdAfter);
         QCOMPARE(child.winIdChangeEventCount(), 3);
         // winId is set to zero during reparenting
-        QVERIFY(0 == child.m_winIdList[1]);
+        QCOMPARE(WId(0), child.m_winIdList[1]);
     }
 
     {
@@ -3971,7 +3971,7 @@ void tst_QWidget::winIdChangeEvent()
         QCOMPARE(winIdBefore, winIdAfter);
         QCOMPARE(child.winIdChangeEventCount(), 3);
         // winId is set to zero during reparenting
-        QVERIFY(0 == child.m_winIdList[1]);
+        QCOMPARE(WId(0), child.m_winIdList[1]);
     }
 }
 
@@ -10484,7 +10484,7 @@ void tst_QWidget::qmlSetParentHelper()
     QWidget child;
     QVERIFY(QAbstractDeclarativeData::setWidgetParent);
     QAbstractDeclarativeData::setWidgetParent(&child, &parent);
-    QVERIFY(child.parentWidget() == &parent);
+    QCOMPARE(child.parentWidget(), &parent);
     QAbstractDeclarativeData::setWidgetParent(&child, 0);
     QVERIFY(!child.parentWidget());
 #else
diff --git a/tests/auto/widgets/kernel/qwidgetaction/tst_qwidgetaction.cpp b/tests/auto/widgets/kernel/qwidgetaction/tst_qwidgetaction.cpp
index d10ce054b0..207ce00dbf 100644
--- a/tests/auto/widgets/kernel/qwidgetaction/tst_qwidgetaction.cpp
+++ b/tests/auto/widgets/kernel/qwidgetaction/tst_qwidgetaction.cpp
@@ -138,14 +138,14 @@ void tst_QWidgetAction::defaultWidget()
         action->setDefaultWidget(combo);
 
         tb1.addAction(action);
-        QVERIFY(combo->parent() == &tb1);
+        QCOMPARE(combo->parent(), &tb1);
         qApp->processEvents();
         qApp->processEvents();
         QVERIFY(combo->isVisible());
 
         // not supported, not supposed to work, hence the parent() check
         tb2.addAction(action);
-        QVERIFY(combo->parent() == &tb1);
+        QCOMPARE(combo->parent(), &tb1);
 
         tb2.removeAction(action);
         tb1.removeAction(action);
@@ -156,11 +156,11 @@ void tst_QWidgetAction::defaultWidget()
         tb2.addAction(action);
         qApp->processEvents(); //the call to hide is delayd by the toolbar layout
         qApp->processEvents();
-        QVERIFY(combo->parent() == &tb2);
+        QCOMPARE(combo->parent(), &tb2);
         QVERIFY(combo->isVisible());
 
         tb1.addAction(action);
-        QVERIFY(combo->parent() == &tb2);
+        QCOMPARE(combo->parent(), &tb2);
 
         delete action;
         QVERIFY(!combo);
@@ -171,17 +171,17 @@ void tst_QWidgetAction::defaultWidget()
 
         QPointer<QComboBox> combo1 = new QComboBox;
         a->setDefaultWidget(combo1);
-        QVERIFY(a->defaultWidget() == combo1);
+        QCOMPARE(a->defaultWidget(), combo1.data());
         a->setDefaultWidget(combo1);
         QVERIFY(combo1);
-        QVERIFY(a->defaultWidget() == combo1);
+        QCOMPARE(a->defaultWidget(), combo1.data());
 
         QPointer<QComboBox> combo2 = new QComboBox;
         QVERIFY(combo1 != combo2);
 
         a->setDefaultWidget(combo2);
         QVERIFY(!combo1);
-        QVERIFY(a->defaultWidget() == combo2);
+        QCOMPARE(a->defaultWidget(), combo2.data());
 
         delete a;
         QVERIFY(!combo2);
@@ -253,7 +253,7 @@ void tst_QWidgetAction::customWidget()
     combos = action->createdWidgets();
     QCOMPARE(combos.count(), 2);
 
-    QVERIFY(combos.at(0) == combo1);
+    QCOMPARE(combos.at(0), combo1.data());
     QPointer<QComboBox> combo2 = qobject_cast<QComboBox *>(combos.at(1));
     QVERIFY(combo2);
 
@@ -277,7 +277,7 @@ void tst_QWidgetAction::keepOwnership()
     {
         QToolBar *tb = new QToolBar;
         tb->addAction(action);
-        QVERIFY(combo->parent() == tb);
+        QCOMPARE(combo->parent(), tb);
         delete tb;
     }
 
diff --git a/tests/auto/widgets/kernel/qwidgetsvariant/tst_qwidgetsvariant.cpp b/tests/auto/widgets/kernel/qwidgetsvariant/tst_qwidgetsvariant.cpp
index 8b566713f9..690ef30f71 100644
--- a/tests/auto/widgets/kernel/qwidgetsvariant/tst_qwidgetsvariant.cpp
+++ b/tests/auto/widgets/kernel/qwidgetsvariant/tst_qwidgetsvariant.cpp
@@ -84,13 +84,13 @@ void tst_QWidgetsVariant::constructor_invalid()
         QTest::ignoreMessage(QtWarningMsg, QRegularExpression("^Trying to construct an instance of an invalid type, type id:"));
         QVariant variant(static_cast<QVariant::Type>(typeId));
         QVERIFY(!variant.isValid());
-        QVERIFY(variant.userType() == QMetaType::UnknownType);
+        QCOMPARE(variant.userType(), int(QMetaType::UnknownType));
     }
     {
         QTest::ignoreMessage(QtWarningMsg, QRegularExpression("^Trying to construct an instance of an invalid type, type id:"));
         QVariant variant(typeId, /* copy */ 0);
         QVERIFY(!variant.isValid());
-        QVERIFY(variant.userType() == QMetaType::UnknownType);
+        QCOMPARE(variant.userType(), int(QMetaType::UnknownType));
     }
 }
 
@@ -208,7 +208,7 @@ void tst_QWidgetsVariant::qvariant_cast_QObject_derived()
     CustomQWidget customWidget;
     QWidget *widget = &customWidget;
     QVariant data = QVariant::fromValue(widget);
-    QVERIFY(data.userType() == qMetaTypeId<QWidget*>());
+    QCOMPARE(data.userType(), qMetaTypeId<QWidget*>());
 
     QCOMPARE(data.value<QObject*>(), widget);
     QCOMPARE(data.value<QWidget*>(), widget);
diff --git a/tests/auto/widgets/kernel/qwindowcontainer/tst_qwindowcontainer.cpp b/tests/auto/widgets/kernel/qwindowcontainer/tst_qwindowcontainer.cpp
index 33427788f6..7d48ab760d 100644
--- a/tests/auto/widgets/kernel/qwindowcontainer/tst_qwindowcontainer.cpp
+++ b/tests/auto/widgets/kernel/qwindowcontainer/tst_qwindowcontainer.cpp
@@ -327,7 +327,7 @@ void tst_QWindowContainer::testDockWidget()
 
     QTest::qWait(1000);
     dock->setFloating(false);
-    QTRY_VERIFY(window->parent() == mainWindow.window()->windowHandle());
+    QTRY_COMPARE(window->parent(), mainWindow.window()->windowHandle());
 }
 
 QTEST_MAIN(tst_QWindowContainer)