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>

21 files changed, 230 insertions, 228 deletions

diff --git a/tests/auto/widgets/widgets/qabstractbutton/tst_qabstractbutton.cpp b/tests/auto/widgets/widgets/qabstractbutton/tst_qabstractbutton.cpp
index a633ba0cf0..43d6912c6e 100644
--- a/tests/auto/widgets/widgets/qabstractbutton/tst_qabstractbutton.cpp
+++ b/tests/auto/widgets/widgets/qabstractbutton/tst_qabstractbutton.cpp
@@ -283,9 +283,9 @@ void tst_QAbstractButton::setAutoRepeat()
         QTest::qWait(REPEAT_DELAY);
         QVERIFY(testWidget->isDown());
         QTest::keyRelease(testWidget, Qt::Key_Space);
-        QVERIFY(release_count == press_count);
-        QVERIFY(toggle_count == 0);
-        QVERIFY(press_count == click_count);
+        QCOMPARE(release_count, press_count);
+        QCOMPARE(toggle_count, uint(0));
+        QCOMPARE(press_count, click_count);
         QVERIFY(click_count > 1);
         break;
     case 4:
diff --git a/tests/auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp b/tests/auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp
index df69063540..5dec6224ca 100644
--- a/tests/auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp
+++ b/tests/auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp
@@ -324,13 +324,13 @@ void tst_QButtonGroup::testSignals()
 
     int expectedId = -2;
 
-    QVERIFY(clickedIdSpy.takeFirst().at(0).toInt() == expectedId);
+    QCOMPARE(clickedIdSpy.takeFirst().at(0).toInt(), expectedId);
     QCOMPARE(pressedSpy.count(), 1);
     QCOMPARE(pressedIdSpy.count(), 1);
-    QVERIFY(pressedIdSpy.takeFirst().at(0).toInt() == expectedId);
+    QCOMPARE(pressedIdSpy.takeFirst().at(0).toInt(), expectedId);
     QCOMPARE(releasedSpy.count(), 1);
     QCOMPARE(releasedIdSpy.count(), 1);
-    QVERIFY(releasedIdSpy.takeFirst().at(0).toInt() == expectedId);
+    QCOMPARE(releasedIdSpy.takeFirst().at(0).toInt(), expectedId);
 
     clickedSpy.clear();
     clickedIdSpy.clear();
@@ -344,13 +344,13 @@ void tst_QButtonGroup::testSignals()
 
     QCOMPARE(clickedSpy.count(), 1);
     QCOMPARE(clickedIdSpy.count(), 1);
-    QVERIFY(clickedIdSpy.takeFirst().at(0).toInt() == 23);
+    QCOMPARE(clickedIdSpy.takeFirst().at(0).toInt(), 23);
     QCOMPARE(pressedSpy.count(), 1);
     QCOMPARE(pressedIdSpy.count(), 1);
-    QVERIFY(pressedIdSpy.takeFirst().at(0).toInt() == 23);
+    QCOMPARE(pressedIdSpy.takeFirst().at(0).toInt(), 23);
     QCOMPARE(releasedSpy.count(), 1);
     QCOMPARE(releasedIdSpy.count(), 1);
-    QVERIFY(releasedIdSpy.takeFirst().at(0).toInt() == 23);
+    QCOMPARE(releasedIdSpy.takeFirst().at(0).toInt(), 23);
 
 
     QSignalSpy toggledSpy(&buttons, SIGNAL(buttonToggled(QAbstractButton*, bool)));
@@ -427,25 +427,25 @@ void tst_QButtonGroup::checkedButton()
     buttons.addButton(&pb1);
     buttons.addButton(&pb2, 23);
 
-    QVERIFY(buttons.checkedButton() == 0);
+    QVERIFY(!buttons.checkedButton());
     pb1.setChecked(true);
-    QVERIFY(buttons.checkedButton() == &pb1);
+    QCOMPARE(buttons.checkedButton(), &pb1);
     pb2.setChecked(true);
-    QVERIFY(buttons.checkedButton() == &pb2);
+    QCOMPARE(buttons.checkedButton(), &pb2);
     pb2.setChecked(false);
-    QVERIFY(buttons.checkedButton() == &pb1);
+    QCOMPARE(buttons.checkedButton(), &pb1);
     pb1.setChecked(false);
-    QVERIFY(buttons.checkedButton() == 0);
+    QVERIFY(!buttons.checkedButton());
 
     buttons.setExclusive(true);
-    QVERIFY(buttons.checkedButton() == 0);
+    QVERIFY(!buttons.checkedButton());
     pb1.setChecked(true);
-    QVERIFY(buttons.checkedButton() == &pb1);
+    QCOMPARE(buttons.checkedButton(), &pb1);
     pb2.setChecked(true);
-    QVERIFY(buttons.checkedButton() == &pb2);
+    QCOMPARE(buttons.checkedButton(), &pb2);
     // checked button cannot be unchecked
     pb2.setChecked(false);
-    QVERIFY(buttons.checkedButton() == &pb2);
+    QCOMPARE(buttons.checkedButton(), &pb2);
 }
 
 class task209485_ButtonDeleter : public QObject
@@ -523,9 +523,9 @@ void tst_QButtonGroup::autoIncrementId()
 
     radio1->setChecked(true);
 
-    QVERIFY(buttons->id(radio1) == -2);
-    QVERIFY(buttons->id(radio2) == -3);
-    QVERIFY(buttons->id(radio3) == -4);
+    QCOMPARE(buttons->id(radio1), -2);
+    QCOMPARE(buttons->id(radio2), -3);
+    QCOMPARE(buttons->id(radio3), -4);
 
     dlg.show();
 }
diff --git a/tests/auto/widgets/widgets/qcheckbox/tst_qcheckbox.cpp b/tests/auto/widgets/widgets/qcheckbox/tst_qcheckbox.cpp
index 5d207c31c5..5696382fab 100644
--- a/tests/auto/widgets/widgets/qcheckbox/tst_qcheckbox.cpp
+++ b/tests/auto/widgets/widgets/qcheckbox/tst_qcheckbox.cpp
@@ -324,7 +324,7 @@ void tst_QCheckBox::isToggleButton()
 
 void tst_QCheckBox::foregroundRole()
 {
-    QVERIFY(testWidget->foregroundRole() == QPalette::WindowText);
+    QCOMPARE(testWidget->foregroundRole(), QPalette::WindowText);
 }
 
 void tst_QCheckBox::minimumSizeHint()
diff --git a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
index 3835981725..fdc5bdd915 100644
--- a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
+++ b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
@@ -453,7 +453,7 @@ void tst_QComboBox::setPalette()
     for (int i = 0; i < comboChildren.size(); ++i) {
         QObject *o = comboChildren.at(i);
         if (o->isWidgetType()) {
-            QVERIFY(((QWidget*)o)->palette() == pal);
+            QCOMPARE(((QWidget*)o)->palette(), pal);
         }
     }
 
@@ -462,12 +462,12 @@ void tst_QComboBox::setPalette()
     //Setting it on the lineedit should be separate form the combo
     testWidget->lineEdit()->setPalette(pal);
     QVERIFY(testWidget->palette() != pal);
-    QVERIFY(testWidget->lineEdit()->palette() == pal);
+    QCOMPARE(testWidget->lineEdit()->palette(), pal);
     pal.setColor(QPalette::Base, Qt::green);
     //Setting it on the combo directly should override lineedit
     testWidget->setPalette(pal);
-    QVERIFY(testWidget->palette() == pal);
-    QVERIFY(testWidget->lineEdit()->palette() == pal);
+    QCOMPARE(testWidget->palette(), pal);
+    QCOMPARE(testWidget->lineEdit()->palette(), pal);
 }
 
 void tst_QComboBox::sizeAdjustPolicy()
@@ -478,7 +478,7 @@ void tst_QComboBox::sizeAdjustPolicy()
     QComboBox *testWidget = topLevel.comboBox();
     // test that adding new items will not change the sizehint for AdjustToContentsOnFirstShow
     QVERIFY(!testWidget->count());
-    QVERIFY(testWidget->sizeAdjustPolicy() == QComboBox::AdjustToContentsOnFirstShow);
+    QCOMPARE(testWidget->sizeAdjustPolicy(), QComboBox::AdjustToContentsOnFirstShow);
     QVERIFY(testWidget->isVisible());
     QSize firstShow = testWidget->sizeHint();
     testWidget->addItem("normal item");
@@ -751,7 +751,7 @@ void tst_QComboBox::insertPolicy()
 
     // First check that there is the right number of entries, or
     // we may unwittingly pass
-    QVERIFY((int)result.count() == testWidget->count());
+    QCOMPARE((int)result.count(), testWidget->count());
 
     // No need to compare if there are no strings to compare
     if (result.count() > 0) {
@@ -796,7 +796,7 @@ void tst_QComboBox::virtualAutocompletion()
     QApplication::sendEvent(testWidget, &kr1);
 
     qApp->processEvents(); // Process events to trigger autocompletion
-    QTRY_VERIFY(testWidget->currentIndex() == 1);
+    QTRY_COMPARE(testWidget->currentIndex(), 1);
 
     QKeyEvent kp2(QEvent::KeyPress, Qt::Key_O, 0, "o");
     QKeyEvent kr2(QEvent::KeyRelease, Qt::Key_O, 0, "o");
@@ -845,7 +845,7 @@ void tst_QComboBox::autoCompletionCaseSensitivity()
     testWidget->clearEditText();
     QSignalSpy spyReturn(testWidget, SIGNAL(activated(int)));
     testWidget->setAutoCompletionCaseSensitivity(Qt::CaseInsensitive);
-    QVERIFY(testWidget->autoCompletionCaseSensitivity() == Qt::CaseInsensitive);
+    QCOMPARE(testWidget->autoCompletionCaseSensitivity(), Qt::CaseInsensitive);
 
     QTest::keyClick(testWidget->lineEdit(), Qt::Key_A);
     qApp->processEvents();
@@ -879,7 +879,7 @@ void tst_QComboBox::autoCompletionCaseSensitivity()
     // case sensitive
     testWidget->clearEditText();
     testWidget->setAutoCompletionCaseSensitivity(Qt::CaseSensitive);
-    QVERIFY(testWidget->autoCompletionCaseSensitivity() == Qt::CaseSensitive);
+    QCOMPARE(testWidget->autoCompletionCaseSensitivity(), Qt::CaseSensitive);
     QTest::keyClick(testWidget->lineEdit(), Qt::Key_A);
     qApp->processEvents();
     QCOMPARE(testWidget->currentText(), QString("aww"));
@@ -1377,7 +1377,7 @@ void tst_QComboBox::textpixmapdata()
         QCOMPARE(icon.cacheKey(), icons.at(i).cacheKey());
         QPixmap original = icons.at(i).pixmap(1024);
         QPixmap pixmap = icon.pixmap(1024);
-        QVERIFY(pixmap.toImage() == original.toImage());
+        QCOMPARE(pixmap.toImage(), original.toImage());
     }
 
     for (int i = 0; i<text.count(); ++i) {
@@ -1611,7 +1611,7 @@ void tst_QComboBox::setModel()
     QCOMPARE(box.currentIndex(), 0);
     QVERIFY(box.model() != oldModel);
     QVERIFY(box.rootModelIndex() != rootModelIndex);
-    QVERIFY(box.rootModelIndex() == QModelIndex());
+    QCOMPARE(box.rootModelIndex(), QModelIndex());
 
     // check that setting the very same model doesn't move the current item
     box.setCurrentIndex(1);
diff --git a/tests/auto/widgets/widgets/qcommandlinkbutton/tst_qcommandlinkbutton.cpp b/tests/auto/widgets/widgets/qcommandlinkbutton/tst_qcommandlinkbutton.cpp
index d8cb7c01ad..a57553097a 100644
--- a/tests/auto/widgets/widgets/qcommandlinkbutton/tst_qcommandlinkbutton.cpp
+++ b/tests/auto/widgets/widgets/qcommandlinkbutton/tst_qcommandlinkbutton.cpp
@@ -98,11 +98,11 @@ void tst_QCommandLinkButton::getSetCheck()
     QString text("mytext");
     QVERIFY(obj1.description().isEmpty());
     obj1.setDescription(text);
-    QVERIFY(obj1.description() == text);
+    QCOMPARE(obj1.description(), text);
 
     QVERIFY(obj1.text().isEmpty());
     obj1.setText(text);
-    QVERIFY(obj1.text() == text);
+    QCOMPARE(obj1.text(), text);
 
     QMenu *var1 = new QMenu;
     obj1.setMenu(var1);
@@ -236,8 +236,8 @@ void tst_QCommandLinkButton::setAutoRepeat()
     QVERIFY( testWidget->isDown() );
     QVERIFY( toggle_count == 0 );
     QTest::keyRelease( testWidget, Qt::Key_Space );
-    QVERIFY(press_count == release_count);
-    QVERIFY(release_count == click_count);
+    QCOMPARE(press_count, release_count);
+    QCOMPARE(release_count, click_count);
     QVERIFY(press_count > 1);
 
     // #### shouldn't I check here to see if multiple signals have been fired???
diff --git a/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp b/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp
index c9ae60dd76..e8a0916dc5 100644
--- a/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp
+++ b/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp
@@ -2416,7 +2416,7 @@ void tst_QDateTimeEdit::displayedSections()
     QFETCH(uint, section);
 
     testWidget->setDisplayFormat(format);
-    QVERIFY((QDateTimeEdit::Section)section == testWidget->displayedSections());
+    QCOMPARE(QDateTimeEdit::Sections(section), testWidget->displayedSections());
 }
 
 void tst_QDateTimeEdit::currentSection_data()
@@ -2460,7 +2460,7 @@ void tst_QDateTimeEdit::currentSection()
     if ((QDateTimeEdit::Section)section == QDateTimeEdit::NoSection)
         testWidget->setCurrentSection(QDateTimeEdit::YearSection); // Ensure it's not reset (see above)
     testWidget->setCurrentSection((QDateTimeEdit::Section)section);
-    QVERIFY((QDateTimeEdit::Section)currentSection == testWidget->currentSection());
+    QCOMPARE((QDateTimeEdit::Section)currentSection, testWidget->currentSection());
 }
 
 void tst_QDateTimeEdit::readOnly()
@@ -2825,7 +2825,7 @@ void tst_QDateTimeEdit::calendarPopup()
     rect = style->subControlRect(QStyle::CC_ComboBox, &opt, QStyle::SC_ComboBoxArrow, &timeEdit);
     QTest::mouseClick(&timeEdit, Qt::LeftButton, 0, QPoint(rect.left()+rect.width()/2, rect.top()+rect.height()/2));
     QWidget *wid2 = timeEdit.findChild<QWidget *>("qt_datetimedit_calendar");
-    QVERIFY(wid2 == 0);
+    QVERIFY(!wid2);
     timeEdit.hide();
 
 
@@ -2839,7 +2839,7 @@ void tst_QDateTimeEdit::calendarPopup()
     rect = style->subControlRect(QStyle::CC_ComboBox, &opt, QStyle::SC_ComboBoxArrow, &dateEdit);
     QTest::mouseClick(&dateEdit, Qt::LeftButton, 0, QPoint(rect.left()+rect.width()/2, rect.top()+rect.height()/2));
     QWidget *wid3 = dateEdit.findChild<QWidget *>("qt_datetimedit_calendar");
-    QVERIFY(wid3 == 0);
+    QVERIFY(!wid3);
     dateEdit.hide();
 }
 
diff --git a/tests/auto/widgets/widgets/qdialogbuttonbox/tst_qdialogbuttonbox.cpp b/tests/auto/widgets/widgets/qdialogbuttonbox/tst_qdialogbuttonbox.cpp
index 38b473e5ae..32412afcd5 100644
--- a/tests/auto/widgets/widgets/qdialogbuttonbox/tst_qdialogbuttonbox.cpp
+++ b/tests/auto/widgets/widgets/qdialogbuttonbox/tst_qdialogbuttonbox.cpp
@@ -132,12 +132,12 @@ void tst_QDialogButtonBox::layoutReuse()
     QDialogButtonBox *box = new QDialogButtonBox(QDialogButtonBox::Ok);
     QPointer<QLayout> layout = box->layout();
     box->setCenterButtons(!box->centerButtons());
-    QVERIFY(layout == box->layout());
+    QCOMPARE(layout.data(), box->layout());
     QEvent event(QEvent::StyleChange);
     QApplication::sendEvent(box, &event);
-    QVERIFY(layout == box->layout());
+    QCOMPARE(layout.data(), box->layout());
     box->setOrientation(box->orientation() == Qt::Horizontal ? Qt::Vertical : Qt::Horizontal);
-    QVERIFY(layout == 0);
+    QVERIFY(layout.isNull());
     QVERIFY(layout != box->layout());
     delete box;
 }
diff --git a/tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp b/tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp
index 2bbc2e05b7..82832bced1 100644
--- a/tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp
+++ b/tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp
@@ -120,7 +120,7 @@ void tst_QDockWidget::widget()
 {
     {
         QDockWidget dw;
-        QVERIFY(dw.widget() == 0);
+        QVERIFY(!dw.widget());
     }
 
     {
@@ -130,32 +130,32 @@ void tst_QDockWidget::widget()
 
         dw.setWidget(w1);
         QVERIFY(dw.widget() != 0);
-        QVERIFY(dw.widget() == w1);
+        QCOMPARE(dw.widget(), w1);
         QCOMPARE(w1->parentWidget(), (QWidget*)&dw);
 
         dw.setWidget(0);
-        QVERIFY(dw.widget() == 0);
+        QVERIFY(!dw.widget());
 
         dw.setWidget(w2);
         QVERIFY(dw.widget() != 0);
-        QVERIFY(dw.widget() == w2);
+        QCOMPARE(dw.widget(), w2);
         QCOMPARE(w2->parentWidget(), (QWidget*)&dw);
 
         dw.setWidget(0);
-        QVERIFY(dw.widget() == 0);
+        QVERIFY(!dw.widget());
 
         dw.setWidget(w1);
         QVERIFY(dw.widget() != 0);
-        QVERIFY(dw.widget() == w1);
+        QCOMPARE(dw.widget(), w1);
         QCOMPARE(w1->parentWidget(), (QWidget*)&dw);
 
         dw.setWidget(w2);
         QVERIFY(dw.widget() != 0);
-        QVERIFY(dw.widget() == w2);
+        QCOMPARE(dw.widget(), w2);
         QCOMPARE(w2->parentWidget(), (QWidget*)&dw);
 
         dw.setWidget(0);
-        QVERIFY(dw.widget() == 0);
+        QVERIFY(!dw.widget());
     }
 
     {
@@ -165,37 +165,37 @@ void tst_QDockWidget::widget()
 
         dw.setWidget(w1);
         QVERIFY(dw.widget() != 0);
-        QVERIFY(dw.widget() == w1);
+        QCOMPARE(dw.widget(), w1);
         QCOMPARE(w1->parentWidget(), (QWidget*)&dw);
 
         w1->setParent(0);
-        QVERIFY(dw.widget() == 0);
+        QVERIFY(!dw.widget());
 
         dw.setWidget(w2);
         QVERIFY(dw.widget() != 0);
-        QVERIFY(dw.widget() == w2);
+        QCOMPARE(dw.widget(), w2);
         QCOMPARE(w2->parentWidget(), (QWidget*)&dw);
 
         w2->setParent(0);
-        QVERIFY(dw.widget() == 0);
+        QVERIFY(!dw.widget());
 
         dw.setWidget(w1);
         QVERIFY(dw.widget() != 0);
-        QVERIFY(dw.widget() == w1);
+        QCOMPARE(dw.widget(), w1);
         QCOMPARE(w1->parentWidget(), (QWidget*)&dw);
 
         dw.setWidget(w2);
         QVERIFY(dw.widget() != 0);
-        QVERIFY(dw.widget() == w2);
+        QCOMPARE(dw.widget(), w2);
         QCOMPARE(w2->parentWidget(), (QWidget*)&dw);
 
         w1->setParent(0);
         QVERIFY(dw.widget() != 0);
-        QVERIFY(dw.widget() == w2);
+        QCOMPARE(dw.widget(), w2);
         QCOMPARE(w2->parentWidget(), (QWidget*)&dw);
 
         w2->setParent(0);
-        QVERIFY(dw.widget() == 0);
+        QVERIFY(!dw.widget());
         delete w1;
         delete w2;
     }
diff --git a/tests/auto/widgets/widgets/qlabel/tst_qlabel.cpp b/tests/auto/widgets/widgets/qlabel/tst_qlabel.cpp
index 63e93d7d6c..789a280e80 100644
--- a/tests/auto/widgets/widgets/qlabel/tst_qlabel.cpp
+++ b/tests/auto/widgets/widgets/qlabel/tst_qlabel.cpp
@@ -321,7 +321,7 @@ void tst_QLabel::eventPropagation()
     test_label->setText(text);
     test_box->events.clear();
     test_label->setTextInteractionFlags(Qt::TextInteractionFlags(textInteractionFlags));
-    QVERIFY(int(test_label->focusPolicy()) == focusPolicy);
+    QCOMPARE(int(test_label->focusPolicy()), focusPolicy);
     QTest::mousePress(test_label, Qt::LeftButton);
     QVERIFY(test_box->events.contains(QEvent::MouseButtonPress) == propagation); // should have propagated!
 }
diff --git a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp
index adedc601a9..5c8f6eeeb8 100644
--- a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp
+++ b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp
@@ -1668,7 +1668,7 @@ void tst_QLineEdit::displayText()
     testWidget->setEchoMode(mode);
     testWidget->setText(insertString);
     QCOMPARE(testWidget->displayText(), expectedString);
-    QVERIFY(testWidget->echoMode() == mode);
+    QCOMPARE(testWidget->echoMode(), mode);
 }
 
 void tst_QLineEdit::passwordEchoOnEdit()
@@ -1838,9 +1838,9 @@ void tst_QLineEdit::maxLength()
 
         // Make sure that the textChanged is not emitted unless the text is actually changed
         if (insertString == expectedString) {
-            QVERIFY(changed_count == 0);
+            QCOMPARE(changed_count, 0);
         } else {
-            QVERIFY(changed_count == 1);
+            QCOMPARE(changed_count, 1);
         }
     }
 
@@ -1961,7 +1961,7 @@ void tst_QLineEdit::psKeyClick(QTestEventList &keys, Qt::Key key, Qt::KeyboardMo
 void tst_QLineEdit::cursorPosition()
 {
     QLineEdit *testWidget = ensureTestWidget();
-    QVERIFY(testWidget->cursorPosition() == 0);
+    QCOMPARE(testWidget->cursorPosition(), 0);
 
     // start with a basic text
     QTest::keyClicks(testWidget, "The");
@@ -2207,7 +2207,7 @@ void tst_QLineEdit::selectedText()
     testWidget->cursorForward(true, 9);
     QVERIFY(testWidget->hasSelectedText());
     QCOMPARE(testWidget->selectedText(), QString("Abc defg "));
-    QVERIFY(selection_count == 1);
+    QCOMPARE(selection_count, 1);
 
     // reset selection
     testWidget->home(false);
@@ -2263,19 +2263,19 @@ void tst_QLineEdit::textChangedAndTextEdited()
     QLineEdit *testWidget = ensureTestWidget();
     QTest::keyClick(testWidget, Qt::Key_A);
     QCOMPARE(changed_count, 1);
-    QVERIFY(edited_count == changed_count);
+    QCOMPARE(edited_count, changed_count);
     QTest::keyClick(testWidget, 'b');
     QCOMPARE(changed_count, 2);
-    QVERIFY(edited_count == changed_count);
+    QCOMPARE(edited_count, changed_count);
     QTest::keyClick(testWidget, 'c');
     QCOMPARE(changed_count, 3);
-    QVERIFY(edited_count == changed_count);
+    QCOMPARE(edited_count, changed_count);
     QTest::keyClick(testWidget, ' ');
     QCOMPARE(changed_count, 4);
-    QVERIFY(edited_count == changed_count);
+    QCOMPARE(edited_count, changed_count);
     QTest::keyClick(testWidget, 'd');
     QCOMPARE(changed_count, 5);
-    QVERIFY(edited_count == changed_count);
+    QCOMPARE(edited_count, changed_count);
 
     changed_count = 0;
     edited_count = 0;
@@ -2321,27 +2321,27 @@ void tst_QLineEdit::returnPressed()
 
     QLineEdit *testWidget = ensureTestWidget();
     QTest::keyClick(testWidget, Qt::Key_Return);
-    QVERIFY(return_count == 1);
+    QCOMPARE(return_count, 1);
     return_count = 0;
 
     QTest::keyClick(testWidget, 'A');
-    QVERIFY(return_count == 0);
+    QCOMPARE(return_count, 0);
     QTest::keyClick(testWidget, 'b');
-    QVERIFY(return_count == 0);
+    QCOMPARE(return_count, 0);
     QTest::keyClick(testWidget, 'c');
-    QVERIFY(return_count == 0);
+    QCOMPARE(return_count, 0);
     QTest::keyClick(testWidget, ' ');
-    QVERIFY(return_count == 0);
+    QCOMPARE(return_count, 0);
     QTest::keyClick(testWidget, 'd');
-    QVERIFY(return_count == 0);
+    QCOMPARE(return_count, 0);
     psKeyClick(testWidget, Qt::Key_Home);
-    QVERIFY(return_count == 0);
+    QCOMPARE(return_count, 0);
     psKeyClick(testWidget, Qt::Key_End);
-    QVERIFY(return_count == 0);
+    QCOMPARE(return_count, 0);
     QTest::keyClick(testWidget, Qt::Key_Escape);
-    QVERIFY(return_count == 0);
+    QCOMPARE(return_count, 0);
     QTest::keyClick(testWidget, Qt::Key_Return);
-    QVERIFY(return_count == 1);
+    QCOMPARE(return_count, 1);
 }
 
 // int validator that fixes all !isNumber to '0'
@@ -2497,14 +2497,14 @@ void tst_QLineEdit::setValidator()
     QCOMPARE(testWidget->validator(), static_cast<const QValidator*>(&iv1));
 
     testWidget->setValidator(0);
-    QVERIFY(testWidget->validator() == 0);
+    QVERIFY(!testWidget->validator());
 
     QIntValidator iv2(0, 99, 0);
     testWidget->setValidator(&iv2);
     QCOMPARE(testWidget->validator(), static_cast<const QValidator *>(&iv2));
 
     testWidget->setValidator(0);
-    QVERIFY(testWidget->validator() == 0);
+    QVERIFY(!testWidget->validator());
 }
 
 void tst_QLineEdit::setValidator_QIntValidator_data()
@@ -2746,7 +2746,7 @@ void tst_QLineEdit::setAlignment()
     QTEST(testWidget, "left");
 #endif
 #endif
-    QVERIFY(testWidget->alignment() == Qt::AlignLeft);
+    QCOMPARE(testWidget->alignment(), Qt::AlignLeft);
 
     testWidget->setText("hcenter");
     testWidget->setAlignment(Qt::AlignHCenter);
@@ -2755,7 +2755,7 @@ void tst_QLineEdit::setAlignment()
     QTEST(testWidget, "hcenter");
 #endif
 #endif
-    QVERIFY(testWidget->alignment() == Qt::AlignHCenter);
+    QCOMPARE(testWidget->alignment(), Qt::AlignHCenter);
 
     testWidget->setText("right");
     testWidget->setAlignment(Qt::AlignRight);
@@ -2764,16 +2764,16 @@ void tst_QLineEdit::setAlignment()
     QTEST(testWidget, "right");
 #endif
 #endif
-    QVERIFY(testWidget->alignment() == Qt::AlignRight);
+    QCOMPARE(testWidget->alignment(), Qt::AlignRight);
 
     testWidget->setAlignment(Qt::AlignTop);
-    QVERIFY(testWidget->alignment() == Qt::AlignTop);
+    QCOMPARE(testWidget->alignment(), Qt::AlignTop);
 
     testWidget->setAlignment(Qt::AlignBottom);
-    QVERIFY(testWidget->alignment() == Qt::AlignBottom);
+    QCOMPARE(testWidget->alignment(), Qt::AlignBottom);
 
     testWidget->setAlignment(Qt::AlignCenter);
-    QVERIFY(testWidget->alignment() == Qt::AlignCenter);
+    QCOMPARE(testWidget->alignment(), Qt::AlignCenter);
 }
 
 void tst_QLineEdit::isModified()
@@ -3081,10 +3081,10 @@ void tst_QLineEdit::maxLengthAndInputMask()
     QLineEdit *testWidget = ensureTestWidget();
     QVERIFY(testWidget->inputMask().isNull());
     testWidget->setMaxLength(10);
-    QVERIFY(testWidget->maxLength() == 10);
+    QCOMPARE(testWidget->maxLength(), 10);
     testWidget->setInputMask(QString::null);
     QVERIFY(testWidget->inputMask().isNull());
-    QVERIFY(testWidget->maxLength() == 10);
+    QCOMPARE(testWidget->maxLength(), 10);
 }
 
 
@@ -4415,7 +4415,7 @@ void tst_QLineEdit::QTBUG1266_setInputMaskEmittingTextEdited()
     QSignalSpy spy(&lineEdit, SIGNAL(textEdited(QString)));
     lineEdit.setInputMask("AAAA");
     lineEdit.setInputMask(QString());
-    QVERIFY(spy.count() == 0);
+    QCOMPARE(spy.count(), 0);
 }
 
 QTEST_MAIN(tst_QLineEdit)
diff --git a/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp b/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp
index 270e5168f7..e8c533f301 100644
--- a/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp
+++ b/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp
@@ -211,15 +211,15 @@ tst_QMainWindow::tst_QMainWindow()
 void tst_QMainWindow::constructor()
 {
     QMainWindow mw;
-    QVERIFY(mw.parentWidget() == 0);
+    QVERIFY(!mw.parentWidget());
     QVERIFY(mw.isWindow());
 
     QMainWindow mw2(&mw);
-    QVERIFY(mw2.parentWidget() == &mw);
+    QCOMPARE(mw2.parentWidget(), &mw);
     QVERIFY(mw2.isWindow());
 
     QMainWindow mw3(&mw, Qt::FramelessWindowHint);
-    QVERIFY(mw3.parentWidget() == &mw);
+    QCOMPARE(mw3.parentWidget(), &mw);
     QVERIFY(mw3.isWindow());
 }
 
@@ -607,7 +607,7 @@ void tst_QMainWindow::menuBar()
         QVERIFY(mw.menuBar() != 0);
         //we now call deleteLater on the previous menubar
         QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete);
-        QVERIFY(mb1 == 0);
+        QVERIFY(mb1.isNull());
 
         mw.setMenuBar(mb2);
         QVERIFY(mw.menuBar() != 0);
@@ -618,7 +618,7 @@ void tst_QMainWindow::menuBar()
         QVERIFY(mw.menuBar() != 0);
         //we now call deleteLater on the previous menubar
         QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete);
-        QVERIFY(mb2 == 0);
+        QVERIFY(mb2.isNull());
 
         mb1 = new QMenuBar;
         mw.setMenuBar(mb1);
@@ -631,7 +631,7 @@ void tst_QMainWindow::menuBar()
         QCOMPARE(mw.menuBar(), (QMenuBar *)mb2);
         //we now call deleteLater on the previous menubar
         QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete);
-        QVERIFY(mb1 == 0);
+        QVERIFY(mb1.isNull());
 
         mb1 = new QMenuBar;
         mw.setMenuBar(mb1);
@@ -639,7 +639,7 @@ void tst_QMainWindow::menuBar()
         QCOMPARE(mw.menuBar(), (QMenuBar *)mb1);
         //we now call deleteLater on the previous menubar
         QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete);
-        QVERIFY(mb2 == 0);
+        QVERIFY(mb2.isNull());
 
         QPointer<QWidget> topLeftCornerWidget = new QWidget;
         mb1->setCornerWidget(topLeftCornerWidget, Qt::TopLeftCorner);
@@ -652,7 +652,7 @@ void tst_QMainWindow::menuBar()
         QCOMPARE(mw.menuBar(), (QMenuBar *)mb2);
         //we now call deleteLater on the previous menubar
         QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete);
-        QVERIFY(mb1 == 0);
+        QVERIFY(mb1.isNull());
 
         QVERIFY(topLeftCornerWidget);
         QCOMPARE(mb2->cornerWidget(Qt::TopLeftCorner), static_cast<QWidget *>(topLeftCornerWidget));
@@ -663,8 +663,8 @@ void tst_QMainWindow::menuBar()
         QVERIFY(mw.menuBar() != 0);
         //we now call deleteLater on the previous menubar
         QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete);
-        QVERIFY(mb2 == 0);
 
+        QVERIFY(mb2.isNull());
         QVERIFY(!topLeftCornerWidget);
         QVERIFY(!topRightCornerWidget);
     }
@@ -692,7 +692,7 @@ void tst_QMainWindow::statusBar()
         QVERIFY(mw.statusBar() != 0);
         //we now call deleteLater on the previous statusbar
         QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete);
-        QVERIFY(sb1 == 0);
+        QVERIFY(sb1.isNull());
 
         mw.setStatusBar(sb2);
         QVERIFY(mw.statusBar() != 0);
@@ -703,7 +703,7 @@ void tst_QMainWindow::statusBar()
         QVERIFY(mw.statusBar() != 0);
         //we now call deleteLater on the previous statusbar
         QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete);
-        QVERIFY(sb2 == 0);
+        QVERIFY(sb2.isNull());
 
         sb1 = new QStatusBar;
         mw.setStatusBar(sb1);
@@ -718,7 +718,7 @@ void tst_QMainWindow::statusBar()
         QCOMPARE(sb2->parentWidget(), (QWidget *)&mw);
         //we now call deleteLater on the previous statusbar
         QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete);
-        QVERIFY(sb1 == 0);
+        QVERIFY(sb1.isNull());
 
         sb1 = new QStatusBar;
         mw.setStatusBar(sb1);
@@ -727,7 +727,7 @@ void tst_QMainWindow::statusBar()
         QCOMPARE(sb1->parentWidget(), (QWidget *)&mw);
         //we now call deleteLater on the previous statusbar
         QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete);
-        QVERIFY(sb2 == 0);
+        QVERIFY(sb2.isNull());
 
         sb2 = new QStatusBar;
         mw.setStatusBar(sb2);
@@ -736,7 +736,7 @@ void tst_QMainWindow::statusBar()
         QCOMPARE(sb2->parentWidget(), (QWidget *)&mw);
         //we now call deleteLater on the previous statusbar
         QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete);
-        QVERIFY(sb1 == 0);
+        QVERIFY(sb1.isNull());
     }
 
     {
@@ -749,7 +749,7 @@ void tst_QMainWindow::statusBar()
         QVERIFY(indexOfSb != -1);
         delete sb;
         indexOfSb = l->indexOf(sb);
-        QVERIFY(indexOfSb == -1);
+        QCOMPARE(indexOfSb, -1);
     }
 }
 
@@ -791,7 +791,7 @@ void tst_QMainWindow::centralWidget()
 {
     {
         QMainWindow mw;
-        QVERIFY(mw.centralWidget() == 0);
+        QVERIFY(!mw.centralWidget());
     }
 
     {
@@ -799,7 +799,7 @@ void tst_QMainWindow::centralWidget()
         QPointer<QWidget> w1 = new QWidget;
         QPointer<QWidget> w2 = new QWidget;
 
-        QVERIFY(mw.centralWidget() == 0);
+        QVERIFY(!mw.centralWidget());
 
         mw.setCentralWidget(w1);
         QVERIFY(mw.centralWidget() != 0);
@@ -812,12 +812,12 @@ void tst_QMainWindow::centralWidget()
         QCOMPARE(w2->parentWidget(), (QWidget *)&mw);
 
         mw.setCentralWidget(0);
-        QVERIFY(mw.centralWidget() == 0);
+        QVERIFY(!mw.centralWidget());
 
         //we now call deleteLater on the previous central widgets
         QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete);
-        QVERIFY(w1 == 0);
-        QVERIFY(w2 == 0);
+        QVERIFY(w1.isNull());
+        QVERIFY(w2.isNull());
     }
 
     {
@@ -831,7 +831,7 @@ void tst_QMainWindow::centralWidget()
         QPointer<QWidget> w1 = new QWidget;
         QPointer<QWidget> w2 = new QWidget;
 
-        QVERIFY(mw.centralWidget() == 0);
+        QVERIFY(!mw.centralWidget());
 
         mw.setCentralWidget(w1);
         QVERIFY(mw.centralWidget() != 0);
@@ -844,12 +844,12 @@ void tst_QMainWindow::centralWidget()
         QCOMPARE(w2->parentWidget(), (QWidget *)&mw);
 
         mw.setCentralWidget(0);
-        QVERIFY(mw.centralWidget() == 0);
+        QVERIFY(!mw.centralWidget());
 
         //we now call deleteLater on the previous central widgets
         QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete);
-        QVERIFY(w1 == 0);
-        QVERIFY(w2 == 0);
+        QVERIFY(w1.isNull());
+        QVERIFY(w2.isNull());
     }
 
 }
@@ -860,25 +860,25 @@ void tst_QMainWindow::takeCentralWidget() {
 
     QPointer<QWidget> w1 = new QWidget;
 
-    QVERIFY(mw.centralWidget() == 0);
+    QVERIFY(!mw.centralWidget());
 
     mw.setCentralWidget(w1);
 
     QWidget *oldCentralWidget = mw.takeCentralWidget();
-    QVERIFY(oldCentralWidget == w1.data());
+    QCOMPARE(oldCentralWidget, w1.data());
 
     // ensure that takeCentralWidget doesn't end up calling deleteLater
     // on the central widget
     QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete);
-    QVERIFY(mw.centralWidget() == 0);
+    QVERIFY(!mw.centralWidget());
     QVERIFY(!w1.isNull());
-    QVERIFY(w1->parent() == 0);
+    QVERIFY(!w1->parent());
 
     mw.setCentralWidget(w1);
     // ensure that the deleteLater called by setCentralWidget
     // gets executed
     QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete);
-    QVERIFY(mw.centralWidget() == w1.data());
+    QCOMPARE(mw.centralWidget(), w1.data());
 
     QPointer<QWidget> w2 = new QWidget;
 
@@ -887,10 +887,10 @@ void tst_QMainWindow::takeCentralWidget() {
     QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete);
     QVERIFY(w1.isNull());
 
-    QVERIFY(mw.centralWidget() == w2.data());
+    QCOMPARE(mw.centralWidget(), w2.data());
 
     QWidget *hopefullyW2 = mw.takeCentralWidget();
-    QVERIFY(mw.centralWidget() == 0);
+    QVERIFY(!mw.centralWidget());
     // ensure that takeCentralWidget doesn't end up calling deleteLater
     // on the central widget
     QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete);
@@ -1928,9 +1928,9 @@ void tst_QMainWindow::toggleUnifiedTitleAndToolBarOnMac()
     mw.show();
     QRect frameGeometry = mw.frameGeometry();
     mw.setUnifiedTitleAndToolBarOnMac(false);
-    QVERIFY(frameGeometry.topLeft() == mw.frameGeometry().topLeft());
+    QCOMPARE(frameGeometry.topLeft(), mw.frameGeometry().topLeft());
     mw.setUnifiedTitleAndToolBarOnMac(true);
-    QVERIFY(frameGeometry.topLeft() == mw.frameGeometry().topLeft());
+    QCOMPARE(frameGeometry.topLeft(), mw.frameGeometry().topLeft());
 }
 #endif
 
diff --git a/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp
index 53defce423..e7de027b22 100644
--- a/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp
+++ b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp
@@ -377,13 +377,13 @@ void tst_QMdiArea::subWindowActivated()
     while (workspace->activeSubWindow() ) {
         workspace->activeSubWindow()->close();
         qApp->processEvents();
-        QVERIFY(activeWindow == workspace->activeSubWindow());
+        QCOMPARE(activeWindow, workspace->activeSubWindow());
         QCOMPARE(spy.count(), 1);
         spy.clear();
     }
 
-    QVERIFY(activeWindow == 0);
-    QVERIFY(workspace->activeSubWindow() == 0);
+    QVERIFY(!activeWindow);
+    QVERIFY(!workspace->activeSubWindow());
     QCOMPARE(workspace->subWindowList().count(), 0);
 
     {
@@ -432,13 +432,13 @@ void tst_QMdiArea::subWindowActivated()
         QCOMPARE(spy.count(), 1);
         spy.clear();
         QVERIFY( activeWindow == window );
-        QVERIFY(workspace->activeSubWindow() == window);
+        QCOMPARE(workspace->activeSubWindow(), window);
         window->close();
         qApp->processEvents();
         QCOMPARE(spy.count(), 1);
         spy.clear();
-        QVERIFY(workspace->activeSubWindow() == 0);
-        QVERIFY( activeWindow == 0 );
+        QVERIFY(!workspace->activeSubWindow());
+        QVERIFY(!activeWindow);
     }
 }
 
@@ -564,8 +564,8 @@ void tst_QMdiArea::subWindowActivatedWithMinimize()
 
     window1->close();
     qApp->processEvents();
-    QVERIFY(workspace->activeSubWindow() == 0);
-    QVERIFY( activeWindow == 0 );
+    QVERIFY(!workspace->activeSubWindow());
+    QVERIFY(!activeWindow);
 
     QVERIFY( workspace->subWindowList().count() == 0 );
 }
@@ -1104,7 +1104,7 @@ void tst_QMdiArea::addAndRemoveWindows()
     QVERIFY(window);
     qApp->processEvents();
     QCOMPARE(workspace.subWindowList().count(), 1);
-    QVERIFY(window->windowFlags() == DefaultWindowFlags);
+    QCOMPARE(window->windowFlags(), DefaultWindowFlags);
     QCOMPARE(window->size(), workspace.viewport()->size());
     }
 
@@ -1115,7 +1115,7 @@ void tst_QMdiArea::addAndRemoveWindows()
     QVERIFY(window);
     qApp->processEvents();
     QCOMPARE(workspace.subWindowList().count(), 2);
-    QVERIFY(window->windowFlags() == DefaultWindowFlags);
+    QCOMPARE(window->windowFlags(), DefaultWindowFlags);
     QCOMPARE(window->size(), window->minimumSize());
     }
 
@@ -1127,7 +1127,7 @@ void tst_QMdiArea::addAndRemoveWindows()
     QVERIFY(window);
     qApp->processEvents();
     QCOMPARE(workspace.subWindowList().count(), 3);
-    QVERIFY(window->windowFlags() == DefaultWindowFlags);
+    QCOMPARE(window->windowFlags(), DefaultWindowFlags);
     QCOMPARE(window->size(), QSize(1500, 1500));
     }
 
@@ -1142,7 +1142,7 @@ void tst_QMdiArea::addAndRemoveWindows()
     QMdiSubWindow *window = new QMdiSubWindow;
     workspace.addSubWindow(window);
     qApp->processEvents();
-    QVERIFY(window->windowFlags() == DefaultWindowFlags);
+    QCOMPARE(window->windowFlags(), DefaultWindowFlags);
     window->setWidget(new QWidget);
     QCOMPARE(workspace.subWindowList().count(), 4);
     QTest::ignoreMessage(QtWarningMsg, "QMdiArea::addSubWindow: window is already added");
@@ -1206,7 +1206,7 @@ void tst_QMdiArea::addAndRemoveWindowsWithReparenting()
 {
     QMdiArea workspace;
     QMdiSubWindow window(&workspace);
-    QVERIFY(window.windowFlags() == DefaultWindowFlags);
+    QCOMPARE(window.windowFlags(), DefaultWindowFlags);
 
     // 0 because the window list contains widgets and not actual
     // windows. Silly, but that's the behavior.
@@ -1219,7 +1219,7 @@ void tst_QMdiArea::addAndRemoveWindowsWithReparenting()
     QCOMPARE(workspace.subWindowList().count(), 0);
     window.setParent(&workspace);
     QCOMPARE(workspace.subWindowList().count(), 1);
-    QVERIFY(window.windowFlags() == DefaultWindowFlags);
+    QCOMPARE(window.windowFlags(), DefaultWindowFlags);
 
     QTest::ignoreMessage(QtWarningMsg, "QMdiArea::addSubWindow: window is already added");
     workspace.addSubWindow(&window);
diff --git a/tests/auto/widgets/widgets/qopenglwidget/tst_qopenglwidget.cpp b/tests/auto/widgets/widgets/qopenglwidget/tst_qopenglwidget.cpp
index e9f9c67856..638fad6206 100644
--- a/tests/auto/widgets/widgets/qopenglwidget/tst_qopenglwidget.cpp
+++ b/tests/auto/widgets/widgets/qopenglwidget/tst_qopenglwidget.cpp
@@ -70,7 +70,7 @@ void tst_QOpenGLWidget::create()
 
     QVERIFY(w->isValid());
     QVERIFY(w->context());
-    QVERIFY(w->context()->format() == w->format());
+    QCOMPARE(w->context()->format(), w->format());
     QVERIFY(w->defaultFramebufferObject() != 0);
 }
 
@@ -304,7 +304,7 @@ void tst_QOpenGLWidget::asViewport()
     // the widget stack.
     btn->update();
     qApp->processEvents();
-    QVERIFY(view->paintCount() == 0);
+    QCOMPARE(view->paintCount(), 0);
 }
 
 class PaintCountWidget : public QOpenGLWidget
diff --git a/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp b/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp
index a2c9302dce..2145260013 100644
--- a/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp
+++ b/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp
@@ -333,7 +333,7 @@ void tst_QPlainTextEdit::selectAllSetsNotSelection()
         QSKIP("Test only relevant for systems with selection");
 
     QApplication::clipboard()->setText(QString("foobar"), QClipboard::Selection);
-    QVERIFY(QApplication::clipboard()->text(QClipboard::Selection) == QString("foobar"));
+    QCOMPARE(QApplication::clipboard()->text(QClipboard::Selection), QString("foobar"));
 
     ed->insertPlainText("Hello World");
     ed->selectAll();
@@ -905,13 +905,13 @@ void tst_QPlainTextEdit::mouseCursorShape()
 {
     // always show an IBeamCursor, see change 170146
     QVERIFY(!ed->isReadOnly());
-    QVERIFY(ed->viewport()->cursor().shape() == Qt::IBeamCursor);
+    QCOMPARE(ed->viewport()->cursor().shape(), Qt::IBeamCursor);
 
     ed->setReadOnly(true);
-    QVERIFY(ed->viewport()->cursor().shape() == Qt::IBeamCursor);
+    QCOMPARE(ed->viewport()->cursor().shape(), Qt::IBeamCursor);
 
     ed->setPlainText("Foo");
-    QVERIFY(ed->viewport()->cursor().shape() == Qt::IBeamCursor);
+    QCOMPARE(ed->viewport()->cursor().shape(), Qt::IBeamCursor);
 }
 #endif
 
@@ -1324,7 +1324,7 @@ void tst_QPlainTextEdit::preserveCharFormatAfterSetPlainText()
     QTextBlock block = ed->document()->begin();
     block = block.next();
     QCOMPARE(block.text(), QString("This should still be blue"));
-    QVERIFY(block.begin().fragment().charFormat().foreground().color() == QColor(Qt::blue));
+    QCOMPARE(block.begin().fragment().charFormat().foreground().color(), QColor(Qt::blue));
 }
 
 void tst_QPlainTextEdit::extraSelections()
@@ -1444,7 +1444,7 @@ void tst_QPlainTextEdit::wordWrapProperty()
         doc->setDocumentLayout(new QPlainTextDocumentLayout(doc));
         edit.setDocument(doc);
         edit.setWordWrapMode(QTextOption::NoWrap);
-        QVERIFY(doc->defaultTextOption().wrapMode() == QTextOption::NoWrap);
+        QCOMPARE(doc->defaultTextOption().wrapMode(), QTextOption::NoWrap);
     }
     {
         QPlainTextEdit edit;
@@ -1452,18 +1452,18 @@ void tst_QPlainTextEdit::wordWrapProperty()
         doc->setDocumentLayout(new QPlainTextDocumentLayout(doc));
         edit.setWordWrapMode(QTextOption::NoWrap);
         edit.setDocument(doc);
-        QVERIFY(doc->defaultTextOption().wrapMode() == QTextOption::NoWrap);
+        QCOMPARE(doc->defaultTextOption().wrapMode(), QTextOption::NoWrap);
     }
 }
 
 void tst_QPlainTextEdit::lineWrapProperty()
 {
-    QVERIFY(ed->wordWrapMode() == QTextOption::WrapAtWordBoundaryOrAnywhere);
-    QVERIFY(ed->lineWrapMode() == QPlainTextEdit::WidgetWidth);
+    QCOMPARE(ed->wordWrapMode(), QTextOption::WrapAtWordBoundaryOrAnywhere);
+    QCOMPARE(ed->lineWrapMode(), QPlainTextEdit::WidgetWidth);
     ed->setLineWrapMode(QPlainTextEdit::NoWrap);
-    QVERIFY(ed->lineWrapMode() == QPlainTextEdit::NoWrap);
-    QVERIFY(ed->wordWrapMode() == QTextOption::WrapAtWordBoundaryOrAnywhere);
-    QVERIFY(ed->document()->defaultTextOption().wrapMode() == QTextOption::NoWrap);
+    QCOMPARE(ed->lineWrapMode(), QPlainTextEdit::NoWrap);
+    QCOMPARE(ed->wordWrapMode(), QTextOption::WrapAtWordBoundaryOrAnywhere);
+    QCOMPARE(ed->document()->defaultTextOption().wrapMode(), QTextOption::NoWrap);
 }
 
 void tst_QPlainTextEdit::selectionChanged()
diff --git a/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp b/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp
index 4fd8b99acf..44a554ad82 100644
--- a/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp
+++ b/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp
@@ -227,8 +227,8 @@ void tst_QPushButton::autoRepeat()
     QVERIFY( testWidget->isDown() );
     QVERIFY( toggle_count == 0 );
     QTest::keyRelease( testWidget, Qt::Key_Space );
-    QVERIFY(press_count == release_count);
-    QVERIFY(release_count == click_count);
+    QCOMPARE(press_count, release_count);
+    QCOMPARE(release_count, click_count);
     QVERIFY(press_count > 1);
 
     // #### shouldn't I check here to see if multiple signals have been fired???
diff --git a/tests/auto/widgets/widgets/qscrollarea/tst_qscrollarea.cpp b/tests/auto/widgets/widgets/qscrollarea/tst_qscrollarea.cpp
index 40e13c8e8d..ce6afc0a57 100644
--- a/tests/auto/widgets/widgets/qscrollarea/tst_qscrollarea.cpp
+++ b/tests/auto/widgets/widgets/qscrollarea/tst_qscrollarea.cpp
@@ -166,8 +166,8 @@ void tst_QScrollArea::checkHFW_Task_197736()
     scrollArea.setWidgetResizable(false);
     scrollArea.resize(QSize(100,100));
     w->resize(QSize(200,200));
-    QVERIFY(w->width() == 200);
-    QVERIFY(w->height() == 200);
+    QCOMPARE(w->width(), 200);
+    QCOMPARE(w->height(), 200);
 }
 
 QTEST_MAIN(tst_QScrollArea)
diff --git a/tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp b/tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp
index 96f925676b..a991f18110 100644
--- a/tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp
+++ b/tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp
@@ -165,7 +165,7 @@ void tst_QTabWidget::init()
     tw = new QTabWidget(0);
     QCOMPARE(tw->count(), 0);
     QCOMPARE(tw->currentIndex(), -1);
-    QVERIFY(tw->currentWidget() == NULL);
+    QVERIFY(!tw->currentWidget());
 }
 
 void tst_QTabWidget::cleanup()
@@ -208,7 +208,7 @@ void tst_QTabWidget::addRemoveTab()
     QCOMPARE(tw->count(), 0);
     tw->removeTab(-1);
     QCOMPARE(tw->count(), 0);
-    QVERIFY(tw->widget(-1) == 0);
+    QVERIFY(!tw->widget(-1));
 
     QWidget *w = new QWidget();
     int index = tw->addTab(w, LABEL);
@@ -216,7 +216,7 @@ void tst_QTabWidget::addRemoveTab()
     QCOMPARE(tw->indexOf(w), index);
 
     QCOMPARE(tw->count(), 1);
-    QVERIFY(tw->widget(index) == w);
+    QCOMPARE(tw->widget(index), w);
     QCOMPARE(tw->tabText(index), QString(LABEL));
 
     removePage(index);
@@ -333,21 +333,21 @@ void tst_QTabWidget::currentWidget()
 {
     // Test bad arguments
     tw->setCurrentWidget(NULL);
-    QVERIFY(tw->currentWidget() == NULL);
+    QVERIFY(!tw->currentWidget());
 
     int index = addPage();
     QWidget *w = tw->widget(index);
-    QVERIFY(tw->currentWidget() == w);
+    QCOMPARE(tw->currentWidget(), w);
     QCOMPARE(tw->currentIndex(), index);
 
     tw->setCurrentWidget(NULL);
-    QVERIFY(tw->currentWidget() == w);
+    QCOMPARE(tw->currentWidget(), w);
     QCOMPARE(tw->currentIndex(), index);
 
     int index2 = addPage();
     QWidget *w2 = tw->widget(index2);
     Q_UNUSED(w2);
-    QVERIFY(tw->currentWidget() == w);
+    QCOMPARE(tw->currentWidget(), w);
     QCOMPARE(tw->currentIndex(), index);
 
     removePage(index2);
@@ -372,7 +372,7 @@ void tst_QTabWidget::currentIndex()
     QCOMPARE(tw->currentIndex(), firstIndex);
     QCOMPARE(spy.count(), 1);
     QList<QVariant> arguments = spy.takeFirst();
-    QVERIFY(arguments.at(0).toInt() == firstIndex);
+    QCOMPARE(arguments.at(0).toInt(), firstIndex);
 
     int index = addPage();
     QCOMPARE(tw->currentIndex(), firstIndex);
@@ -380,19 +380,19 @@ void tst_QTabWidget::currentIndex()
     QCOMPARE(tw->currentIndex(), index);
     QCOMPARE(spy.count(), 1);
     arguments = spy.takeFirst();
-    QVERIFY(arguments.at(0).toInt() == index);
+    QCOMPARE(arguments.at(0).toInt(), index);
 
     removePage(index);
     QCOMPARE(tw->currentIndex(), firstIndex);
     QCOMPARE(spy.count(), 1);
     arguments = spy.takeFirst();
-    QVERIFY(arguments.at(0).toInt() == firstIndex);
+    QCOMPARE(arguments.at(0).toInt(), firstIndex);
 
     removePage(firstIndex);
     QCOMPARE(tw->currentIndex(), -1);
     QCOMPARE(spy.count(), 1);
     arguments = spy.takeFirst();
-    QVERIFY(arguments.at(0).toInt() == -1);
+    QCOMPARE(arguments.at(0).toInt(), -1);
 }
 
 void tst_QTabWidget::cornerWidget()
@@ -400,24 +400,24 @@ void tst_QTabWidget::cornerWidget()
     // Test bad arguments
     tw->setCornerWidget(NULL, Qt::TopRightCorner);
 
-    QVERIFY(tw->cornerWidget(Qt::TopLeftCorner) == 0);
-    QVERIFY(tw->cornerWidget(Qt::TopRightCorner) == 0);
-    QVERIFY(tw->cornerWidget(Qt::BottomLeftCorner) == 0);
-    QVERIFY(tw->cornerWidget(Qt::BottomRightCorner) == 0);
+    QVERIFY(!tw->cornerWidget(Qt::TopLeftCorner));
+    QVERIFY(!tw->cornerWidget(Qt::TopRightCorner));
+    QVERIFY(!tw->cornerWidget(Qt::BottomLeftCorner));
+    QVERIFY(!tw->cornerWidget(Qt::BottomRightCorner));
 
     QWidget *w = new QWidget(0);
     tw->setCornerWidget(w, Qt::TopLeftCorner);
     QCOMPARE(w->parent(), (QObject *)tw);
-    QVERIFY(tw->cornerWidget(Qt::TopLeftCorner) == w);
+    QCOMPARE(tw->cornerWidget(Qt::TopLeftCorner), w);
     tw->setCornerWidget(w, Qt::TopRightCorner);
-    QVERIFY(tw->cornerWidget(Qt::TopRightCorner) == w);
+    QCOMPARE(tw->cornerWidget(Qt::TopRightCorner), w);
     tw->setCornerWidget(w, Qt::BottomLeftCorner);
-    QVERIFY(tw->cornerWidget(Qt::BottomLeftCorner) == w);
+    QCOMPARE(tw->cornerWidget(Qt::BottomLeftCorner), w);
     tw->setCornerWidget(w, Qt::BottomRightCorner);
-    QVERIFY(tw->cornerWidget(Qt::BottomRightCorner) == w);
+    QCOMPARE(tw->cornerWidget(Qt::BottomRightCorner), w);
 
     tw->setCornerWidget(0, Qt::TopRightCorner);
-    QVERIFY(tw->cornerWidget(Qt::TopRightCorner) == 0);
+    QVERIFY(!tw->cornerWidget(Qt::TopRightCorner));
     QCOMPARE(w->isHidden(), true);
 }
 
diff --git a/tests/auto/widgets/widgets/qtextbrowser/tst_qtextbrowser.cpp b/tests/auto/widgets/widgets/qtextbrowser/tst_qtextbrowser.cpp
index 5a03446b90..adc768f828 100644
--- a/tests/auto/widgets/widgets/qtextbrowser/tst_qtextbrowser.cpp
+++ b/tests/auto/widgets/widgets/qtextbrowser/tst_qtextbrowser.cpp
@@ -141,14 +141,14 @@ void tst_QTextBrowser::noReloadOnAnchorJump()
     browser->setSource(url);
     QCOMPARE(browser->htmlLoadAttempts, 1);
     QVERIFY(!browser->toPlainText().isEmpty());
-    QVERIFY(browser->source() == url);
+    QCOMPARE(browser->source(), url);
 }
 
 void tst_QTextBrowser::bgColorOnSourceChange()
 {
     browser->setSource(QUrl::fromLocalFile("pagewithbg.html"));
     QVERIFY(browser->document()->rootFrame()->frameFormat().hasProperty(QTextFormat::BackgroundBrush));
-    QVERIFY(browser->document()->rootFrame()->frameFormat().background().color() == Qt::blue);
+    QCOMPARE(browser->document()->rootFrame()->frameFormat().background().color(), QColor(Qt::blue));
 
     browser->setSource(QUrl::fromLocalFile("pagewithoutbg.html"));
     QVERIFY(!browser->document()->rootFrame()->frameFormat().hasProperty(QTextFormat::BackgroundBrush));
@@ -167,12 +167,12 @@ void tst_QTextBrowser::forwardButton()
 
     QVERIFY(!forwardEmissions.isEmpty());
     QVariant val = forwardEmissions.takeLast()[0];
-    QVERIFY(val.type() == QVariant::Bool);
+    QCOMPARE(val.type(), QVariant::Bool);
     QVERIFY(!val.toBool());
 
     QVERIFY(!backwardEmissions.isEmpty());
     val = backwardEmissions.takeLast()[0];
-    QVERIFY(val.type() == QVariant::Bool);
+    QCOMPARE(val.type(), QVariant::Bool);
     QVERIFY(!val.toBool());
 
     QVERIFY(browser->historyTitle(-1).isEmpty());
@@ -185,12 +185,12 @@ void tst_QTextBrowser::forwardButton()
 
     QVERIFY(!forwardEmissions.isEmpty());
     val = forwardEmissions.takeLast()[0];
-    QVERIFY(val.type() == QVariant::Bool);
+    QCOMPARE(val.type(), QVariant::Bool);
     QVERIFY(!val.toBool());
 
     QVERIFY(!backwardEmissions.isEmpty());
     val = backwardEmissions.takeLast()[0];
-    QVERIFY(val.type() == QVariant::Bool);
+    QCOMPARE(val.type(), QVariant::Bool);
     QVERIFY(val.toBool());
 
     QCOMPARE(browser->historyTitle(-1), QString("Page With BG"));
@@ -201,12 +201,12 @@ void tst_QTextBrowser::forwardButton()
 
     QVERIFY(!forwardEmissions.isEmpty());
     val = forwardEmissions.takeLast()[0];
-    QVERIFY(val.type() == QVariant::Bool);
+    QCOMPARE(val.type(), QVariant::Bool);
     QVERIFY(val.toBool());
 
     QVERIFY(!backwardEmissions.isEmpty());
     val = backwardEmissions.takeLast()[0];
-    QVERIFY(val.type() == QVariant::Bool);
+    QCOMPARE(val.type(), QVariant::Bool);
     QVERIFY(!val.toBool());
 
     QVERIFY(browser->historyTitle(-1).isEmpty());
@@ -217,12 +217,12 @@ void tst_QTextBrowser::forwardButton()
 
     QVERIFY(!forwardEmissions.isEmpty());
     val = forwardEmissions.takeLast()[0];
-    QVERIFY(val.type() == QVariant::Bool);
+    QCOMPARE(val.type(), QVariant::Bool);
     QVERIFY(!val.toBool());
 
     QVERIFY(!backwardEmissions.isEmpty());
     val = backwardEmissions.takeLast()[0];
-    QVERIFY(val.type() == QVariant::Bool);
+    QCOMPARE(val.type(), QVariant::Bool);
     QVERIFY(val.toBool());
 }
 
@@ -244,29 +244,29 @@ void tst_QTextBrowser::relativeLinks()
     QSignalSpy sourceChangedSpy(browser, SIGNAL(sourceChanged(QUrl)));
     browser->setSource(QUrl("subdir/../qtextbrowser.html"));
     QVERIFY(!browser->document()->isEmpty());
-    QVERIFY(sourceChangedSpy.count() == 1);
+    QCOMPARE(sourceChangedSpy.count(), 1);
     QCOMPARE(sourceChangedSpy.takeFirst()[0].toUrl(), QUrl("subdir/../qtextbrowser.html"));
     browser->setSource(QUrl("subdir/index.html"));
     QVERIFY(!browser->document()->isEmpty());
-    QVERIFY(sourceChangedSpy.count() == 1);
+    QCOMPARE(sourceChangedSpy.count(), 1);
     QCOMPARE(sourceChangedSpy.takeFirst()[0].toUrl(), QUrl("subdir/index.html"));
     browser->setSource(QUrl("anchor.html"));
     QVERIFY(!browser->document()->isEmpty());
-    QVERIFY(sourceChangedSpy.count() == 1);
+    QCOMPARE(sourceChangedSpy.count(), 1);
     QCOMPARE(sourceChangedSpy.takeFirst()[0].toUrl(), QUrl("anchor.html"));
     browser->setSource(QUrl("subdir/index.html"));
     QVERIFY(!browser->document()->isEmpty());
-    QVERIFY(sourceChangedSpy.count() == 1);
+    QCOMPARE(sourceChangedSpy.count(), 1);
     QCOMPARE(sourceChangedSpy.takeFirst()[0].toUrl(), QUrl("subdir/index.html"));
 
     // using QUrl::fromLocalFile()
     browser->setSource(QUrl::fromLocalFile("anchor.html"));
     QVERIFY(!browser->document()->isEmpty());
-    QVERIFY(sourceChangedSpy.count() == 1);
+    QCOMPARE(sourceChangedSpy.count(), 1);
     QCOMPARE(sourceChangedSpy.takeFirst()[0].toUrl(), QUrl("file:anchor.html"));
     browser->setSource(QUrl("subdir/../qtextbrowser.html"));
     QVERIFY(!browser->document()->isEmpty());
-    QVERIFY(sourceChangedSpy.count() == 1);
+    QCOMPARE(sourceChangedSpy.count(), 1);
     QCOMPARE(sourceChangedSpy.takeFirst()[0].toUrl(), QUrl("subdir/../qtextbrowser.html"));
 }
 
@@ -446,13 +446,13 @@ void tst_QTextBrowser::sourceInsideLoadResource()
 void tst_QTextBrowser::textInteractionFlags_vs_readOnly()
 {
     QVERIFY(browser->isReadOnly());
-    QVERIFY(browser->textInteractionFlags() == Qt::TextBrowserInteraction);
+    QCOMPARE(browser->textInteractionFlags(), Qt::TextBrowserInteraction);
     browser->setReadOnly(true);
-    QVERIFY(browser->textInteractionFlags() == Qt::TextBrowserInteraction);
+    QCOMPARE(browser->textInteractionFlags(), Qt::TextBrowserInteraction);
     browser->setReadOnly(false);
-    QVERIFY(browser->textInteractionFlags() == Qt::TextEditorInteraction);
+    QCOMPARE(browser->textInteractionFlags(), Qt::TextEditorInteraction);
     browser->setReadOnly(true);
-    QVERIFY(browser->textInteractionFlags() == Qt::TextBrowserInteraction);
+    QCOMPARE(browser->textInteractionFlags(), Qt::TextBrowserInteraction);
 }
 
 void tst_QTextBrowser::anchorsWithSelfBuiltHtml()
@@ -525,7 +525,7 @@ void tst_QTextBrowser::loadResourceOnRelativeLocalFiles()
     QVERIFY(!browser->toPlainText().isEmpty());
     QVariant v = browser->loadResource(QTextDocument::HtmlResource, QUrl("../anchor.html"));
     QVERIFY(v.isValid());
-    QVERIFY(v.type() == QVariant::ByteArray);
+    QCOMPARE(v.type(), QVariant::ByteArray);
     QVERIFY(!v.toByteArray().isEmpty());
 }
 
@@ -658,7 +658,7 @@ void tst_QTextBrowser::urlEncoding()
     QCOMPARE(spy.count(), 1);
 
     QUrl url = spy.at(0).at(0).toUrl();
-    QVERIFY(url.toEncoded() == QByteArray("http://www.google.com/q=%22"));
+    QCOMPARE(url.toEncoded(), QByteArray("http://www.google.com/q=%22"));
 
     delete browser;
 }
diff --git a/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp b/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp
index 6c92c860f0..fb7c3e8a68 100644
--- a/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp
+++ b/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp
@@ -398,12 +398,13 @@ void tst_QTextEdit::cleanup()
 
 void tst_QTextEdit::inlineAttributesOnInsert()
 {
-    QVERIFY(ed->textCursor().charFormat().foreground().color() != Qt::blue);
+    const QColor blue(Qt::blue);
+    QVERIFY(ed->textCursor().charFormat().foreground().color() != blue);
 
-    ed->setTextColor(Qt::blue);
+    ed->setTextColor(blue);
     QTest::keyClick(ed, Qt::Key_A);
 
-    QVERIFY(ed->textCursor().charFormat().foreground().color() == Qt::blue);
+    QCOMPARE(ed->textCursor().charFormat().foreground().color(), blue);
 }
 
 void tst_QTextEdit::inlineAttributesOnSelection()
@@ -457,7 +458,7 @@ void tst_QTextEdit::autoBulletList1()
     QTest::keyClicks(ed, "*This should become a list");
 
     QVERIFY(ed->textCursor().currentList());
-    QVERIFY(ed->textCursor().currentList()->format().style() == QTextListFormat::ListDisc);
+    QCOMPARE(ed->textCursor().currentList()->format().style(), QTextListFormat::ListDisc);
 }
 
 void tst_QTextEdit::autoBulletList2()
@@ -582,7 +583,7 @@ void tst_QTextEdit::selectAllSetsNotSelection()
     }
 
     QApplication::clipboard()->setText(QString("foobar"), QClipboard::Selection);
-    QVERIFY(QApplication::clipboard()->text(QClipboard::Selection) == QString("foobar"));
+    QCOMPARE(QApplication::clipboard()->text(QClipboard::Selection), QString("foobar"));
 
     ed->insertPlainText("Hello World");
     ed->selectAll();
@@ -867,11 +868,12 @@ void tst_QTextEdit::appendShouldUseCurrentFormat()
     fmt.setFontItalic(true);
     ed->setCurrentCharFormat(fmt);
     ed->append("Hello");
+    const QColor blue(Qt::blue);
 
     QTextCursor cursor(ed->document());
 
     QVERIFY(cursor.movePosition(QTextCursor::NextCharacter));
-    QVERIFY(cursor.charFormat().foreground().color() != Qt::blue);
+    QVERIFY(cursor.charFormat().foreground().color() != blue);
     QVERIFY(!cursor.charFormat().fontItalic());
 
     QVERIFY(cursor.movePosition(QTextCursor::NextBlock));
@@ -883,7 +885,7 @@ void tst_QTextEdit::appendShouldUseCurrentFormat()
     }
 
     QVERIFY(cursor.movePosition(QTextCursor::NextCharacter));
-    QVERIFY(cursor.charFormat().foreground().color() == Qt::blue);
+    QCOMPARE(cursor.charFormat().foreground().color(), blue);
     QVERIFY(cursor.charFormat().fontItalic());
 }
 
@@ -1211,7 +1213,7 @@ void tst_QTextEdit::lineWrapModes()
 {
     ed->setLineWrapMode(QTextEdit::NoWrap);
     // NoWrap at the same time as having all lines that are all left aligned means we optimize to only layout once. The effect is that the width is always 0
-    QVERIFY(ed->document()->pageSize().width() == qreal(0));
+    QCOMPARE(ed->document()->pageSize().width(), qreal(0));
 
     QTextCursor cursor = QTextCursor(ed->document());
     cursor.insertText(QString("A simple line"));
@@ -1237,13 +1239,13 @@ void tst_QTextEdit::mouseCursorShape()
 {
     // always show an IBeamCursor, see change 170146
     QVERIFY(!ed->isReadOnly());
-    QVERIFY(ed->viewport()->cursor().shape() == Qt::IBeamCursor);
+    QCOMPARE(ed->viewport()->cursor().shape(), Qt::IBeamCursor);
 
     ed->setReadOnly(true);
-    QVERIFY(ed->viewport()->cursor().shape() == Qt::IBeamCursor);
+    QCOMPARE(ed->viewport()->cursor().shape(), Qt::IBeamCursor);
 
     ed->setPlainText("Foo");
-    QVERIFY(ed->viewport()->cursor().shape() == Qt::IBeamCursor);
+    QCOMPARE(ed->viewport()->cursor().shape(), Qt::IBeamCursor);
 }
 #endif
 
@@ -1661,7 +1663,7 @@ void tst_QTextEdit::preserveCharFormatAfterSetPlainText()
     QTextBlock block = ed->document()->begin();
     block = block.next();
     QCOMPARE(block.text(), QString("This should still be blue"));
-    QVERIFY(block.begin().fragment().charFormat().foreground().color() == QColor(Qt::blue));
+    QCOMPARE(block.begin().fragment().charFormat().foreground().color(), QColor(Qt::blue));
 }
 
 void tst_QTextEdit::extraSelections()
@@ -1796,25 +1798,25 @@ void tst_QTextEdit::wordWrapProperty()
         QTextDocument *doc = new QTextDocument(&edit);
         edit.setDocument(doc);
         edit.setWordWrapMode(QTextOption::NoWrap);
-        QVERIFY(doc->defaultTextOption().wrapMode() == QTextOption::NoWrap);
+        QCOMPARE(doc->defaultTextOption().wrapMode(), QTextOption::NoWrap);
     }
     {
         QTextEdit edit;
         QTextDocument *doc = new QTextDocument(&edit);
         edit.setWordWrapMode(QTextOption::NoWrap);
         edit.setDocument(doc);
-        QVERIFY(doc->defaultTextOption().wrapMode() == QTextOption::NoWrap);
+        QCOMPARE(doc->defaultTextOption().wrapMode(), QTextOption::NoWrap);
     }
 }
 
 void tst_QTextEdit::lineWrapProperty()
 {
-    QVERIFY(ed->wordWrapMode() == QTextOption::WrapAtWordBoundaryOrAnywhere);
-    QVERIFY(ed->lineWrapMode() == QTextEdit::WidgetWidth);
+    QCOMPARE(ed->wordWrapMode(), QTextOption::WrapAtWordBoundaryOrAnywhere);
+    QCOMPARE(ed->lineWrapMode(), QTextEdit::WidgetWidth);
     ed->setLineWrapMode(QTextEdit::NoWrap);
-    QVERIFY(ed->lineWrapMode() == QTextEdit::NoWrap);
-    QVERIFY(ed->wordWrapMode() == QTextOption::WrapAtWordBoundaryOrAnywhere);
-    QVERIFY(ed->document()->defaultTextOption().wrapMode() == QTextOption::NoWrap);
+    QCOMPARE(ed->lineWrapMode(), QTextEdit::NoWrap);
+    QCOMPARE(ed->wordWrapMode(), QTextOption::WrapAtWordBoundaryOrAnywhere);
+    QCOMPARE(ed->document()->defaultTextOption().wrapMode(), QTextOption::NoWrap);
 }
 
 void tst_QTextEdit::selectionChanged()
@@ -2119,7 +2121,7 @@ void tst_QTextEdit::setDocumentPreservesPalette()
 
     QTextDocument *newDoc = new QTextDocument(ed);
     ed->setDocument(newDoc);
-    QVERIFY(control->document() == newDoc);
+    QCOMPARE(control->document(), newDoc);
     QVERIFY(whitePal.color(QPalette::Active, QPalette::Text)
             == control->palette().color(QPalette::Active, QPalette::Text));
 }
diff --git a/tests/auto/widgets/widgets/qtoolbar/tst_qtoolbar.cpp b/tests/auto/widgets/widgets/qtoolbar/tst_qtoolbar.cpp
index 642abc3add..e653a85d96 100644
--- a/tests/auto/widgets/widgets/qtoolbar/tst_qtoolbar.cpp
+++ b/tests/auto/widgets/widgets/qtoolbar/tst_qtoolbar.cpp
@@ -513,13 +513,13 @@ void tst_QToolBar::insertWidget()
         QToolBar tb;
         QPointer<QWidget> widget = new QWidget;
         QAction *action = tb.addWidget(widget);
-        QVERIFY(action->parent() == &tb);
+        QCOMPARE(action->parent(), &tb);
 
         QToolBar tb2;
         tb.removeAction(action);
         tb2.addAction(action);
         QVERIFY(widget && widget->parent() == &tb2);
-        QVERIFY(action->parent() == &tb2);
+        QCOMPARE(action->parent(), &tb2);
     }
 }
 
@@ -978,10 +978,10 @@ void tst_QToolBar::actionOwnership()
         QToolBar *tb2 = new QToolBar;
 
         QPointer<QAction> action = tb1->addAction("test");
-        QVERIFY(action->parent() == tb1);
+        QCOMPARE(action->parent(), tb1);
 
         tb2->addAction(action);
-        QVERIFY(action->parent() == tb1);
+        QCOMPARE(action->parent(), tb1);
 
         delete tb1;
         QVERIFY(!action);
@@ -992,13 +992,13 @@ void tst_QToolBar::actionOwnership()
         QToolBar *tb2 = new QToolBar;
 
         QPointer<QAction> action = tb1->addAction("test");
-        QVERIFY(action->parent() == tb1);
+        QCOMPARE(action->parent(), tb1);
 
         tb1->removeAction(action);
-        QVERIFY(action->parent() == tb1);
+        QCOMPARE(action->parent(), tb1);
 
         tb2->addAction(action);
-        QVERIFY(action->parent() == tb1);
+        QCOMPARE(action->parent(), tb1);
 
         delete tb1;
         QVERIFY(!action);
diff --git a/tests/auto/widgets/widgets/qtoolbutton/tst_qtoolbutton.cpp b/tests/auto/widgets/widgets/qtoolbutton/tst_qtoolbutton.cpp
index 03fbae2e57..0d1abe5032 100644
--- a/tests/auto/widgets/widgets/qtoolbutton/tst_qtoolbutton.cpp
+++ b/tests/auto/widgets/widgets/qtoolbutton/tst_qtoolbutton.cpp
@@ -170,10 +170,10 @@ void tst_QToolButton::collapseTextOnPriority()
 
     QStyleOptionToolButton option;
     button.initStyleOption(&option);
-    QVERIFY(option.toolButtonStyle == Qt::ToolButtonTextBesideIcon);
+    QCOMPARE(option.toolButtonStyle, Qt::ToolButtonTextBesideIcon);
     action.setPriority(QAction::LowPriority);
     button.initStyleOption(&option);
-    QVERIFY(option.toolButtonStyle == Qt::ToolButtonIconOnly);
+    QCOMPARE(option.toolButtonStyle, Qt::ToolButtonIconOnly);
 }