tests/auto/gui: 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: I624deb320c378c18a29b3707f48583d53bfd5186
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>

12 files changed, 573 insertions, 568 deletions

diff --git a/tests/auto/gui/text/qcssparser/tst_qcssparser.cpp b/tests/auto/gui/text/qcssparser/tst_qcssparser.cpp
index 5d78bc1d01..b1beb0ffd0 100644
--- a/tests/auto/gui/text/qcssparser/tst_qcssparser.cpp
+++ b/tests/auto/gui/text/qcssparser/tst_qcssparser.cpp
@@ -203,8 +203,8 @@ void tst_QCssParser::scanner()
     QCss::Scanner::scan(QCss::Scanner::preprocess(QString::fromUtf8(inputFile.readAll())), &symbols);
 
     QVERIFY(symbols.count() > 1);
-    QVERIFY(symbols.last().token == QCss::S);
-    QVERIFY(symbols.last().lexem() == QLatin1String("\n"));
+    QCOMPARE(symbols.last().token, QCss::S);
+    QCOMPARE(symbols.last().lexem(), QLatin1String("\n"));
     symbols.remove(symbols.count() - 1, 1);
 
     QFile outputFile(output);
@@ -861,7 +861,7 @@ void tst_QCssParser::colorValue()
     QCss::Declaration decl;
     QVERIFY(parser.parseNextDeclaration(&decl));
     const QColor col = decl.colorValue();
-    QVERIFY(expectedColor.isValid() == col.isValid());
+    QCOMPARE(expectedColor.isValid(), col.isValid());
     QCOMPARE(col, expectedColor);
 }
 
@@ -1304,7 +1304,7 @@ void tst_QCssParser::rulesForNode()
             decls += rules.at(i).declarations;
     }
 
-    QVERIFY(decls.count() == declCount);
+    QCOMPARE(decls.count(), declCount);
 
     if (declCount > 0)
         QCOMPARE(decls.at(0).d->values.at(0).variant.toString(), value0);
@@ -1364,7 +1364,7 @@ void tst_QCssParser::shorthandBackgroundProperty()
     v.extractBackground(&brush, &image, &repeat, &alignment, &origin, &attachment, &ignoredOrigin);
 
     QFETCH(QBrush, expectedBrush);
-    QVERIFY(expectedBrush.color() == brush.color());
+    QCOMPARE(expectedBrush.color(), brush.color());
 
     QTEST(image, "expectedImage");
     QTEST(int(repeat), "expectedRepeatValue");
@@ -1372,7 +1372,7 @@ void tst_QCssParser::shorthandBackgroundProperty()
 
     //QTBUG-9674  : a second evaluation should give the same results
     QVERIFY(v.extractBackground(&brush, &image, &repeat, &alignment, &origin, &attachment, &ignoredOrigin));
-    QVERIFY(expectedBrush.color() == brush.color());
+    QCOMPARE(expectedBrush.color(), brush.color());
     QTEST(image, "expectedImage");
     QTEST(int(repeat), "expectedRepeatValue");
     QTEST(int(alignment), "expectedAlignment");
@@ -1438,7 +1438,7 @@ void tst_QCssParser::pseudoElement()
         decls += rules.at(i).declarations;
 
     }
-    QVERIFY(decls.count() == declCount);
+    QCOMPARE(decls.count(), declCount);
 }
 
 void tst_QCssParser::gradient_data()
@@ -1517,21 +1517,21 @@ void tst_QCssParser::gradient()
     QBrush sbg, abg;
     QVERIFY(ve.extractPalette(&fg, &sfg, &sbg, &abg));
     if (type == "linear") {
-        QVERIFY(sbg.style() == Qt::LinearGradientPattern);
+        QCOMPARE(sbg.style(), Qt::LinearGradientPattern);
         const QLinearGradient *lg = static_cast<const QLinearGradient *>(sbg.gradient());
         QCOMPARE(lg->start(), start);
         QCOMPARE(lg->finalStop(), finalStop);
     } else if (type == "conical") {
-        QVERIFY(sbg.style() == Qt::ConicalGradientPattern);
+        QCOMPARE(sbg.style(), Qt::ConicalGradientPattern);
         const QConicalGradient *cg = static_cast<const QConicalGradient *>(sbg.gradient());
         QCOMPARE(cg->center(), start);
     }
     const QGradient *g = sbg.gradient();
     QCOMPARE(g->spread(), QGradient::Spread(spread));
-    QVERIFY(g->stops().at(0).first == stop0);
-    QVERIFY(g->stops().at(0).second == color0);
-    QVERIFY(g->stops().at(1).first == stop1);
-    QVERIFY(g->stops().at(1).second == color1);
+    QCOMPARE(g->stops().at(0).first, stop0);
+    QCOMPARE(g->stops().at(0).second, color0);
+    QCOMPARE(g->stops().at(1).first, stop1);
+    QCOMPARE(g->stops().at(1).second, color1);
 }
 
 void tst_QCssParser::extractFontFamily_data()
@@ -1637,15 +1637,15 @@ void tst_QCssParser::extractBorder()
     QSize radii[4];
 
     extractor.extractBorder(widths, colors, styles, radii);
-    QVERIFY(widths[QCss::TopEdge] == expectedTopWidth);
-    QVERIFY(styles[QCss::TopEdge] == expectedTopStyle);
-    QVERIFY(colors[QCss::TopEdge] == expectedTopColor);
+    QCOMPARE(widths[QCss::TopEdge], expectedTopWidth);
+    QCOMPARE(int(styles[QCss::TopEdge]), expectedTopStyle);
+    QCOMPARE(colors[QCss::TopEdge].color(), expectedTopColor);
 
     //QTBUG-9674  : a second evaluation should give the same results
     QVERIFY(extractor.extractBorder(widths, colors, styles, radii));
-    QVERIFY(widths[QCss::TopEdge] == expectedTopWidth);
-    QVERIFY(styles[QCss::TopEdge] == expectedTopStyle);
-    QVERIFY(colors[QCss::TopEdge] == expectedTopColor);
+    QCOMPARE(widths[QCss::TopEdge], expectedTopWidth);
+    QCOMPARE(int(styles[QCss::TopEdge]), expectedTopStyle);
+    QCOMPARE(colors[QCss::TopEdge].color(), expectedTopColor);
 }
 
 void tst_QCssParser::noTextDecoration()
diff --git a/tests/auto/gui/text/qfont/tst_qfont.cpp b/tests/auto/gui/text/qfont/tst_qfont.cpp
index 64b06e9856..462e5115b4 100644
--- a/tests/auto/gui/text/qfont/tst_qfont.cpp
+++ b/tests/auto/gui/text/qfont/tst_qfont.cpp
@@ -217,15 +217,15 @@ void tst_QFont::exactMatch()
                                     || fontinfo.family().isEmpty());
                         }
                         if (font.pointSize() != -1) {
-                            QVERIFY(font.pointSize() == fontinfo.pointSize());
+                            QCOMPARE(font.pointSize(), fontinfo.pointSize());
                         } else {
-                            QVERIFY(font.pixelSize() == fontinfo.pixelSize());
+                            QCOMPARE(font.pixelSize(), fontinfo.pixelSize());
                         }
-                        QVERIFY(font.italic() == fontinfo.italic());
+                        QCOMPARE(font.italic(), fontinfo.italic());
                         if (font.weight() != fontinfo.weight()) {
                             qDebug("font is %s", font.toString().toLatin1().constData());
                         }
-                        QVERIFY(font.weight() == fontinfo.weight());
+                        QCOMPARE(font.weight(), fontinfo.weight());
                     } else {
                         font.setFixedPitch(!fontinfo.fixedPitch());
                         QFontInfo fontinfo1(font);
@@ -274,12 +274,12 @@ void tst_QFont::exactMatch()
                                     || fontinfo.family().contains(font.family())
                                     || fontinfo.family().isEmpty());
                             if (font.pointSize() != -1) {
-                                QVERIFY(font.pointSize() == fontinfo.pointSize());
+                                QCOMPARE(font.pointSize(), fontinfo.pointSize());
                             } else {
-                                QVERIFY(font.pixelSize() == fontinfo.pixelSize());
+                                QCOMPARE(font.pixelSize(), fontinfo.pixelSize());
                             }
-                            QVERIFY(font.italic() == fontinfo.italic());
-                            QVERIFY(font.weight() == fontinfo.weight());
+                            QCOMPARE(font.italic(), fontinfo.italic());
+                            QCOMPARE(font.weight(), fontinfo.weight());
                         } else {
                             font.setFixedPitch(!fontinfo.fixedPitch());
                             QFontInfo fontinfo1(font, (QFont::Script) script);
@@ -371,42 +371,42 @@ void tst_QFont::compare()
         QVERIFY(font != font2);
         QCOMPARE(font < font2,!(font2 < font));
         font2.setItalic(false);
-        QVERIFY(font == font2);
+        QCOMPARE(font, font2);
         QVERIFY(!(font < font2));
 
         font2.setWeight(QFont::Bold);
         QVERIFY(font != font2);
         QCOMPARE(font < font2,!(font2 < font));
         font2.setWeight(QFont::Normal);
-        QVERIFY(font == font2);
+        QCOMPARE(font, font2);
         QVERIFY(!(font < font2));
 
         font.setUnderline(true);
         QVERIFY(font != font2);
         QCOMPARE(font < font2,!(font2 < font));
         font.setUnderline(false);
-        QVERIFY(font == font2);
+        QCOMPARE(font, font2);
         QVERIFY(!(font < font2));
 
         font.setStrikeOut(true);
         QVERIFY(font != font2);
         QCOMPARE(font < font2,!(font2 < font));
         font.setStrikeOut(false);
-        QVERIFY(font == font2);
+        QCOMPARE(font, font2);
         QVERIFY(!(font < font2));
 
         font.setOverline(true);
         QVERIFY(font != font2);
         QCOMPARE(font < font2,!(font2 < font));
         font.setOverline(false);
-        QVERIFY(font == font2);
+        QCOMPARE(font, font2);
         QVERIFY(!(font < font2));
 
         font.setCapitalization(QFont::SmallCaps);
         QVERIFY(font != font2);
         QCOMPARE(font < font2,!(font2 < font));
         font.setCapitalization(QFont::MixedCase);
-        QVERIFY(font == font2);
+        QCOMPARE(font, font2);
         QVERIFY(!(font < font2));
     }
 }
@@ -426,27 +426,27 @@ void tst_QFont::resolve()
     font1.setWeight(QFont::Bold);
     QFont font2 = font1.resolve(font);
 
-    QVERIFY(font2.weight() == font1.weight());
+    QCOMPARE(font2.weight(), font1.weight());
 
-    QVERIFY(font2.pointSize() == font.pointSize());
-    QVERIFY(font2.italic() == font.italic());
-    QVERIFY(font2.underline() == font.underline());
-    QVERIFY(font2.overline() == font.overline());
-    QVERIFY(font2.strikeOut() == font.strikeOut());
-    QVERIFY(font2.stretch() == font.stretch());
+    QCOMPARE(font2.pointSize(), font.pointSize());
+    QCOMPARE(font2.italic(), font.italic());
+    QCOMPARE(font2.underline(), font.underline());
+    QCOMPARE(font2.overline(), font.overline());
+    QCOMPARE(font2.strikeOut(), font.strikeOut());
+    QCOMPARE(font2.stretch(), font.stretch());
 
     QFont font3;
     font3.setStretch(QFont::UltraCondensed);
     QFont font4 = font3.resolve(font1).resolve(font);
 
-    QVERIFY(font4.stretch() == font3.stretch());
+    QCOMPARE(font4.stretch(), font3.stretch());
 
-    QVERIFY(font4.weight() == font.weight());
-    QVERIFY(font4.pointSize() == font.pointSize());
-    QVERIFY(font4.italic() == font.italic());
-    QVERIFY(font4.underline() == font.underline());
-    QVERIFY(font4.overline() == font.overline());
-    QVERIFY(font4.strikeOut() == font.strikeOut());
+    QCOMPARE(font4.weight(), font.weight());
+    QCOMPARE(font4.pointSize(), font.pointSize());
+    QCOMPARE(font4.italic(), font.italic());
+    QCOMPARE(font4.underline(), font.underline());
+    QCOMPARE(font4.overline(), font.overline());
+    QCOMPARE(font4.strikeOut(), font.strikeOut());
 
 
     QFont f1,f2,f3;
@@ -479,8 +479,8 @@ void tst_QFont::resetFont()
 
     child->setFont(QFont()); // reset font
 
-    QVERIFY(child->font().resolve() == 0);
-    QVERIFY(child->font().pointSize() == parent.font().pointSize());
+    QCOMPARE(child->font().resolve(), uint(0));
+    QCOMPARE(child->font().pointSize(), parent.font().pointSize());
     QVERIFY(parent.font().resolve() != 0);
 }
 #endif
@@ -728,24 +728,24 @@ void tst_QFont::sharing()
     QCOMPARE(QFontPrivate::get(f)->engineData->ref.load(), 1 + refs_by_cache);
 
     QFont f2(f);
-    QVERIFY(QFontPrivate::get(f2) == QFontPrivate::get(f));
+    QCOMPARE(QFontPrivate::get(f2), QFontPrivate::get(f));
     QCOMPARE(QFontPrivate::get(f2)->ref.load(), 2);
     QVERIFY(QFontPrivate::get(f2)->engineData);
-    QVERIFY(QFontPrivate::get(f2)->engineData == QFontPrivate::get(f)->engineData);
+    QCOMPARE(QFontPrivate::get(f2)->engineData, QFontPrivate::get(f)->engineData);
     QCOMPARE(QFontPrivate::get(f2)->engineData->ref.load(), 1 + refs_by_cache);
 
     f2.setKerning(!f.kerning());
     QVERIFY(QFontPrivate::get(f2) != QFontPrivate::get(f));
     QCOMPARE(QFontPrivate::get(f2)->ref.load(), 1);
     QVERIFY(QFontPrivate::get(f2)->engineData);
-    QVERIFY(QFontPrivate::get(f2)->engineData == QFontPrivate::get(f)->engineData);
+    QCOMPARE(QFontPrivate::get(f2)->engineData, QFontPrivate::get(f)->engineData);
     QCOMPARE(QFontPrivate::get(f2)->engineData->ref.load(), 2 + refs_by_cache);
 
     f2 = f;
-    QVERIFY(QFontPrivate::get(f2) == QFontPrivate::get(f));
+    QCOMPARE(QFontPrivate::get(f2), QFontPrivate::get(f));
     QCOMPARE(QFontPrivate::get(f2)->ref.load(), 2);
     QVERIFY(QFontPrivate::get(f2)->engineData);
-    QVERIFY(QFontPrivate::get(f2)->engineData == QFontPrivate::get(f)->engineData);
+    QCOMPARE(QFontPrivate::get(f2)->engineData, QFontPrivate::get(f)->engineData);
     QCOMPARE(QFontPrivate::get(f2)->engineData->ref.load(), 1 + refs_by_cache);
 
     if (f.pointSize() > 0)
diff --git a/tests/auto/gui/text/qsyntaxhighlighter/tst_qsyntaxhighlighter.cpp b/tests/auto/gui/text/qsyntaxhighlighter/tst_qsyntaxhighlighter.cpp
index c0b0738e2a..06448d11fe 100644
--- a/tests/auto/gui/text/qsyntaxhighlighter/tst_qsyntaxhighlighter.cpp
+++ b/tests/auto/gui/text/qsyntaxhighlighter/tst_qsyntaxhighlighter.cpp
@@ -170,7 +170,7 @@ void tst_QSyntaxHighlighter::basic()
     QVERIFY(hl->highlighted);
     QVERIFY(lout->documentChangedCalled);
 
-    QVERIFY(doc->begin().layout()->formats() == formats);
+    QCOMPARE(doc->begin().layout()->formats(), formats);
 }
 
 class CommentTestHighlighter : public QSyntaxHighlighter
diff --git a/tests/auto/gui/text/qtextblock/tst_qtextblock.cpp b/tests/auto/gui/text/qtextblock/tst_qtextblock.cpp
index 967fe3114e..49300871d9 100644
--- a/tests/auto/gui/text/qtextblock/tst_qtextblock.cpp
+++ b/tests/auto/gui/text/qtextblock/tst_qtextblock.cpp
@@ -102,7 +102,7 @@ void tst_QTextBlock::fragmentOverBlockBoundaries()
     // Block separators are always a fragment of their self. Thus:
     // |Hello|\b|World|\b|
 #if !defined(Q_OS_WIN)
-    QVERIFY(doc->docHandle()->fragmentMap().numNodes() == 4);
+    QCOMPARE(doc->docHandle()->fragmentMap().numNodes(), 4);
 #endif
     QCOMPARE(cursor.block().text(), QString("Hello"));
     cursor.movePosition(QTextCursor::NextBlock);
@@ -126,7 +126,7 @@ void tst_QTextBlock::excludeParagraphSeparatorFragment()
 
     ++it;
     QVERIFY(it.atEnd());
-    QVERIFY(it == block.end());
+    QCOMPARE(it, block.end());
 }
 
 void tst_QTextBlock::backwardsBlockIterator()
diff --git a/tests/auto/gui/text/qtextcursor/tst_qtextcursor.cpp b/tests/auto/gui/text/qtextcursor/tst_qtextcursor.cpp
index d60d1e2ba1..9396cd678b 100644
--- a/tests/auto/gui/text/qtextcursor/tst_qtextcursor.cpp
+++ b/tests/auto/gui/text/qtextcursor/tst_qtextcursor.cpp
@@ -178,15 +178,15 @@ void tst_QTextCursor::navigation1()
     QVERIFY(doc->toPlainText() == "Hello World");
 
     cursor.movePosition(QTextCursor::End);
-    QVERIFY(cursor.position() == 11);
+    QCOMPARE(cursor.position(), 11);
     cursor.deletePreviousChar();
-    QVERIFY(cursor.position() == 10);
+    QCOMPARE(cursor.position(), 10);
     cursor.deletePreviousChar();
     cursor.deletePreviousChar();
     cursor.deletePreviousChar();
     cursor.deletePreviousChar();
     cursor.deletePreviousChar();
-    QVERIFY(doc->toPlainText() == "Hello");
+    QCOMPARE(doc->toPlainText(), QLatin1String("Hello"));
 
     QTextCursor otherCursor(doc);
     otherCursor.movePosition(QTextCursor::Start);
@@ -195,12 +195,12 @@ void tst_QTextCursor::navigation1()
     cursor.movePosition(QTextCursor::Right);
     QVERIFY(cursor != otherCursor);
     otherCursor.insertText("Hey");
-    QVERIFY(cursor.position() == 5);
+    QCOMPARE(cursor.position(), 5);
 
     doc->undo();
-    QVERIFY(cursor.position() == 2);
+    QCOMPARE(cursor.position(), 2);
     doc->redo();
-    QVERIFY(cursor.position() == 5);
+    QCOMPARE(cursor.position(), 5);
 
     doc->undo();
 
@@ -209,29 +209,29 @@ void tst_QTextCursor::navigation1()
 
     cursor.movePosition(QTextCursor::Start);
     cursor.movePosition(QTextCursor::Right, QTextCursor::MoveAnchor, 6);
-    QVERIFY(cursor.position() == 6);
+    QCOMPARE(cursor.position(), 6);
     otherCursor = cursor;
     otherCursor.movePosition(QTextCursor::Right, QTextCursor::MoveAnchor, 2);
     otherCursor.deletePreviousChar();
     otherCursor.deletePreviousChar();
     otherCursor.deletePreviousChar();
-    QVERIFY(cursor.position() == 5);
+    QCOMPARE(cursor.position(), 5);
 
     cursor.movePosition(QTextCursor::End);
     cursor.insertBlock();
     {
         int oldPos = cursor.position();
         cursor.movePosition(QTextCursor::End);
-        QVERIFY(cursor.position() == oldPos);
+        QCOMPARE(cursor.position(), oldPos);
     }
     QVERIFY(cursor.atBlockStart());
-    QVERIFY(cursor.position() == 9);
+    QCOMPARE(cursor.position(), 9);
 
     QTextCharFormat fmt;
     fmt.setForeground(Qt::blue);
     cursor.insertText("Test", fmt);
-    QVERIFY(fmt == cursor.charFormat());
-    QVERIFY(cursor.position() == 13);
+    QCOMPARE(fmt, cursor.charFormat());
+    QCOMPARE(cursor.position(), 13);
 }
 
 void tst_QTextCursor::navigation2_data()
@@ -573,8 +573,8 @@ void tst_QTextCursor::insertBlock()
     QTextBlockFormat fmt;
     fmt.setTopMargin(100);
     cursor.insertBlock(fmt);
-    QVERIFY(cursor.position() == 1);
-    QVERIFY(cursor.blockFormat() == fmt);
+    QCOMPARE(cursor.position(), 1);
+    QCOMPARE(cursor.blockFormat(), fmt);
 }
 
 void tst_QTextCursor::insertWithBlockSeparator1()
@@ -584,28 +584,28 @@ void tst_QTextCursor::insertWithBlockSeparator1()
     cursor.insertText(text);
 
     cursor.movePosition(QTextCursor::PreviousBlock);
-    QVERIFY(cursor.position() == 0);
+    QCOMPARE(cursor.position(), 0);
 
     cursor.movePosition(QTextCursor::NextBlock);
-    QVERIFY(cursor.position() == 6);
+    QCOMPARE(cursor.position(), 6);
 }
 
 void tst_QTextCursor::insertWithBlockSeparator2()
 {
     cursor.insertText(QString(QChar::ParagraphSeparator));
-    QVERIFY(cursor.position() == 1);
+    QCOMPARE(cursor.position(), 1);
 }
 
 void tst_QTextCursor::insertWithBlockSeparator3()
 {
     cursor.insertText(QString(QChar::ParagraphSeparator) + "Hi" + QString(QChar::ParagraphSeparator));
-    QVERIFY(cursor.position() == 4);
+    QCOMPARE(cursor.position(), 4);
 }
 
 void tst_QTextCursor::insertWithBlockSeparator4()
 {
     cursor.insertText(QString(QChar::ParagraphSeparator) + QString(QChar::ParagraphSeparator));
-    QVERIFY(cursor.position() == 2);
+    QCOMPARE(cursor.position(), 2);
 }
 
 void tst_QTextCursor::clearObjectType1()
@@ -656,7 +656,7 @@ void tst_QTextCursor::comparisonOperators1()
     midCursor.movePosition(QTextCursor::NextWord);
 
     QVERIFY(midCursor <= cursor);
-    QVERIFY(midCursor == cursor);
+    QCOMPARE(midCursor, cursor);
     QVERIFY(midCursor >= cursor);
 
     QVERIFY(midCursor > startCursor);
@@ -690,7 +690,7 @@ void tst_QTextCursor::comparisonOperators2()
     QTextCursor cursor2(&doc2);
 
     QVERIFY(cursor1 != cursor2);
-    QVERIFY(cursor1 == QTextCursor(&doc1));
+    QCOMPARE(cursor1, QTextCursor(&doc1));
 }
 
 void tst_QTextCursor::selection1()
@@ -718,97 +718,97 @@ void tst_QTextCursor::dontCopyTableAttributes()
 
 void tst_QTextCursor::checkFrame1()
 {
-    QVERIFY(cursor.position() == 0);
+    QCOMPARE(cursor.position(), 0);
     QPointer<QTextFrame> frame = cursor.insertFrame(QTextFrameFormat());
     QVERIFY(frame != 0);
 
     QTextFrame *root = frame->parentFrame();
     QVERIFY(root != 0);
 
-    QVERIFY(frame->firstPosition() == 1);
-    QVERIFY(frame->lastPosition() == 1);
+    QCOMPARE(frame->firstPosition(), 1);
+    QCOMPARE(frame->lastPosition(), 1);
     QVERIFY(frame->parentFrame() != 0);
-    QVERIFY(root->childFrames().size() == 1);
+    QCOMPARE(root->childFrames().size(), 1);
 
-    QVERIFY(cursor.position() == 1);
-    QVERIFY(cursor.selectionStart() == 1);
-    QVERIFY(cursor.selectionEnd() == 1);
+    QCOMPARE(cursor.position(), 1);
+    QCOMPARE(cursor.selectionStart(), 1);
+    QCOMPARE(cursor.selectionEnd(), 1);
 
     doc->undo();
 
     QVERIFY(!frame);
-    QVERIFY(root->childFrames().size() == 0);
+    QCOMPARE(root->childFrames().size(), 0);
 
-    QVERIFY(cursor.position() == 0);
-    QVERIFY(cursor.selectionStart() == 0);
-    QVERIFY(cursor.selectionEnd() == 0);
+    QCOMPARE(cursor.position(), 0);
+    QCOMPARE(cursor.selectionStart(), 0);
+    QCOMPARE(cursor.selectionEnd(), 0);
 
     doc->redo();
 
     frame = doc->frameAt(1);
 
     QVERIFY(frame);
-    QVERIFY(frame->firstPosition() == 1);
-    QVERIFY(frame->lastPosition() == 1);
+    QCOMPARE(frame->firstPosition(), 1);
+    QCOMPARE(frame->lastPosition(), 1);
     QVERIFY(frame->parentFrame() != 0);
-    QVERIFY(root->childFrames().size() == 1);
+    QCOMPARE(root->childFrames().size(), 1);
 
-    QVERIFY(cursor.position() == 1);
-    QVERIFY(cursor.selectionStart() == 1);
-    QVERIFY(cursor.selectionEnd() == 1);
+    QCOMPARE(cursor.position(), 1);
+    QCOMPARE(cursor.selectionStart(), 1);
+    QCOMPARE(cursor.selectionEnd(), 1);
 
 //     cursor.movePosition(QTextCursor::Right, QTextCursor::KeepAnchor);
-//     QVERIFY(cursor.position() == 2);
-//     QVERIFY(cursor.selectionStart() == 0);
-//     QVERIFY(cursor.selectionEnd() == 2);
+//     QCOMPARE(cursor.position(), 2);
+//     QCOMPARE(cursor.selectionStart(), 0);
+//     QCOMPARE(cursor.selectionEnd(), 2);
 }
 
 void tst_QTextCursor::checkFrame2()
 {
-    QVERIFY(cursor.position() == 0);
+    QCOMPARE(cursor.position(), 0);
     cursor.insertText("A");
-    QVERIFY(cursor.position() == 1);
+    QCOMPARE(cursor.position(), 1);
     cursor.movePosition(QTextCursor::Start, QTextCursor::KeepAnchor);
 
     QPointer<QTextFrame> frame = cursor.insertFrame(QTextFrameFormat());
     QTextFrame *root = frame->parentFrame();
 
-    QVERIFY(frame->firstPosition() == 1);
-    QVERIFY(frame->lastPosition() == 2);
+    QCOMPARE(frame->firstPosition(), 1);
+    QCOMPARE(frame->lastPosition(), 2);
     QVERIFY(frame->parentFrame() != 0);
-    QVERIFY(root->childFrames().size() == 1);
+    QCOMPARE(root->childFrames().size(), 1);
 
-    QVERIFY(cursor.position() == 1);
-    QVERIFY(cursor.selectionStart() == 1);
-    QVERIFY(cursor.selectionEnd() == 2);
+    QCOMPARE(cursor.position(), 1);
+    QCOMPARE(cursor.selectionStart(), 1);
+    QCOMPARE(cursor.selectionEnd(), 2);
 
     doc->undo();
 
     QVERIFY(!frame);
-    QVERIFY(root->childFrames().size() == 0);
+    QCOMPARE(root->childFrames().size(), 0);
 
-    QVERIFY(cursor.position() == 0);
-    QVERIFY(cursor.selectionStart() == 0);
-    QVERIFY(cursor.selectionEnd() == 1);
+    QCOMPARE(cursor.position(), 0);
+    QCOMPARE(cursor.selectionStart(), 0);
+    QCOMPARE(cursor.selectionEnd(), 1);
 
     doc->redo();
 
     frame = doc->frameAt(1);
 
     QVERIFY(frame);
-    QVERIFY(frame->firstPosition() == 1);
-    QVERIFY(frame->lastPosition() == 2);
+    QCOMPARE(frame->firstPosition(), 1);
+    QCOMPARE(frame->lastPosition(), 2);
     QVERIFY(frame->parentFrame() != 0);
-    QVERIFY(root->childFrames().size() == 1);
+    QCOMPARE(root->childFrames().size(), 1);
 
-    QVERIFY(cursor.position() == 1);
-    QVERIFY(cursor.selectionStart() == 1);
-    QVERIFY(cursor.selectionEnd() == 2);
+    QCOMPARE(cursor.position(), 1);
+    QCOMPARE(cursor.selectionStart(), 1);
+    QCOMPARE(cursor.selectionEnd(), 2);
 
     cursor.movePosition(QTextCursor::Left, QTextCursor::KeepAnchor);
-    QVERIFY(cursor.position() == 0);
-    QVERIFY(cursor.selectionStart() == 0);
-    QVERIFY(cursor.selectionEnd() == 3);
+    QCOMPARE(cursor.position(), 0);
+    QCOMPARE(cursor.selectionStart(), 0);
+    QCOMPARE(cursor.selectionEnd(), 3);
 }
 
 void tst_QTextCursor::insertBlockToUseCharFormat()
@@ -833,9 +833,9 @@ void tst_QTextCursor::insertBlockToUseCharFormat()
 
 void tst_QTextCursor::tableMovement()
 {
-    QVERIFY(cursor.position() == 0);
+    QCOMPARE(cursor.position(), 0);
     cursor.insertText("AA");
-    QVERIFY(cursor.position() == 2);
+    QCOMPARE(cursor.position(), 2);
     cursor.movePosition(QTextCursor::Left);
 
     cursor.insertTable(3, 3);
@@ -1030,7 +1030,7 @@ void tst_QTextCursor::insertBlockShouldRemoveSelection()
     cursor.insertBlock();
 
     QVERIFY(!cursor.hasSelection());
-    QVERIFY(doc->toPlainText().indexOf("Hello") == -1);
+    QCOMPARE(doc->toPlainText().indexOf("Hello"), -1);
 }
 
 void tst_QTextCursor::insertBlockShouldRemoveSelection2()
@@ -1046,7 +1046,7 @@ void tst_QTextCursor::insertBlockShouldRemoveSelection2()
     cursor.insertBlock(fmt);
 
     QVERIFY(!cursor.hasSelection());
-    QVERIFY(doc->toPlainText().indexOf("Hello") == -1);
+    QCOMPARE(doc->toPlainText().indexOf("Hello"), -1);
 }
 
 void tst_QTextCursor::mergeCellShouldUpdateSelection()
@@ -1159,7 +1159,7 @@ void tst_QTextCursor::setBlockFormatInTable()
     cursor.setBlockFormat(fmt);
 
     cursor.movePosition(QTextCursor::Start);
-    QVERIFY(cursor.blockFormat().background().color() == Qt::blue);
+    QCOMPARE(cursor.blockFormat().background().color(), QColor(Qt::blue));
 }
 
 void tst_QTextCursor::blockCharFormat2()
@@ -1174,7 +1174,7 @@ void tst_QTextCursor::blockCharFormat2()
     cursor.movePosition(QTextCursor::Start);
     cursor.insertText("Red");
     cursor.movePosition(QTextCursor::PreviousCharacter);
-    QVERIFY(cursor.charFormat().foreground().color() == Qt::red);
+    QCOMPARE(cursor.charFormat().foreground().color(), QColor(Qt::red));
 }
 
 void tst_QTextCursor::blockCharFormat3()
@@ -1189,21 +1189,23 @@ void tst_QTextCursor::blockCharFormat3()
     cursor.insertText("Test");
     cursor.movePosition(QTextCursor::Start);
     cursor.movePosition(QTextCursor::NextCharacter);
-    QVERIFY(cursor.charFormat().foreground().color() == Qt::green);
+    const QColor red(Qt::red);
+    const QColor green(Qt::green);
+    QCOMPARE(cursor.charFormat().foreground().color(), green);
 
     cursor.movePosition(QTextCursor::Start);
-    QVERIFY(cursor.charFormat().foreground().color() == Qt::green);
+    QCOMPARE(cursor.charFormat().foreground().color(), green);
 
     fmt.setForeground(Qt::red);
     cursor.setBlockCharFormat(fmt);
-    QVERIFY(cursor.blockCharFormat().foreground().color() == Qt::red);
+    QCOMPARE(cursor.blockCharFormat().foreground().color(), red);
 
     cursor.movePosition(QTextCursor::End);
     cursor.movePosition(QTextCursor::Start);
-    QVERIFY(cursor.charFormat().foreground().color() == Qt::green);
+    QCOMPARE(cursor.charFormat().foreground().color(), green);
 
     cursor.insertText("Test");
-    QVERIFY(cursor.charFormat().foreground().color() == Qt::green);
+    QCOMPARE(cursor.charFormat().foreground().color(), green);
 
     cursor.select(QTextCursor::Document);
     cursor.removeSelectedText();
@@ -1212,7 +1214,7 @@ void tst_QTextCursor::blockCharFormat3()
     QVERIFY(cursor.atStart());
 
     cursor.insertText("Test");
-    QVERIFY(cursor.charFormat().foreground().color() == Qt::red);
+    QCOMPARE(cursor.charFormat().foreground().color(), red);
 }
 
 void tst_QTextCursor::blockCharFormat()
@@ -1222,12 +1224,12 @@ void tst_QTextCursor::blockCharFormat()
     cursor.insertBlock(QTextBlockFormat(), fmt);
     cursor.insertText("Hm");
 
-    QVERIFY(cursor.blockCharFormat().foreground().color() == Qt::blue);
+    QCOMPARE(cursor.blockCharFormat().foreground().color(), QColor(Qt::blue));
 
     fmt.setForeground(Qt::red);
 
     cursor.setBlockCharFormat(fmt);
-    QVERIFY(cursor.blockCharFormat().foreground().color() == Qt::red);
+    QCOMPARE(cursor.blockCharFormat().foreground().color(), QColor(Qt::red));
 }
 
 void tst_QTextCursor::blockCharFormatOnSelection()
@@ -1249,11 +1251,11 @@ void tst_QTextCursor::blockCharFormatOnSelection()
 
     cursor.movePosition(QTextCursor::Start);
     cursor.movePosition(QTextCursor::NextBlock);
-    QVERIFY(cursor.blockCharFormat().foreground().color() == Qt::blue);
+    QCOMPARE(cursor.blockCharFormat().foreground().color(), QColor(Qt::blue));
     cursor.movePosition(QTextCursor::NextBlock);
-    QVERIFY(cursor.blockCharFormat().foreground().color() == Qt::red);
+    QCOMPARE(cursor.blockCharFormat().foreground().color(), QColor(Qt::red));
     cursor.movePosition(QTextCursor::NextBlock);
-    QVERIFY(cursor.blockCharFormat().foreground().color() == Qt::white);
+    QCOMPARE(cursor.blockCharFormat().foreground().color(), QColor(Qt::white));
 
     cursor.movePosition(QTextCursor::Start);
     cursor.movePosition(QTextCursor::NextBlock);
@@ -1264,17 +1266,17 @@ void tst_QTextCursor::blockCharFormatOnSelection()
 
     cursor.movePosition(QTextCursor::Start);
     cursor.movePosition(QTextCursor::NextBlock);
-    QVERIFY(cursor.blockCharFormat().foreground().color() == Qt::cyan);
+    QCOMPARE(cursor.blockCharFormat().foreground().color(), QColor(Qt::cyan));
 
     cursor.movePosition(QTextCursor::Right);
     cursor.movePosition(QTextCursor::Right);
-    QVERIFY(cursor.charFormat().foreground().color() == Qt::green);
+    QCOMPARE(cursor.charFormat().foreground().color(), QColor(Qt::green));
 
     cursor.movePosition(QTextCursor::NextBlock);
-    QVERIFY(cursor.blockCharFormat().foreground().color() == Qt::cyan);
+    QCOMPARE(cursor.blockCharFormat().foreground().color(), QColor(Qt::cyan));
 
     cursor.movePosition(QTextCursor::NextBlock);
-    QVERIFY(cursor.blockCharFormat().foreground().color() == Qt::white);
+    QCOMPARE(cursor.blockCharFormat().foreground().color(), QColor(Qt::white));
 }
 
 void tst_QTextCursor::anchorInitialized1()
@@ -1404,7 +1406,7 @@ void tst_QTextCursor::selectBlock()
 
     cursor.movePosition(QTextCursor::Start);
     cursor.movePosition(QTextCursor::NextBlock);
-    QVERIFY(cursor.blockFormat().alignment() == Qt::AlignHCenter);
+    QCOMPARE(cursor.blockFormat().alignment(), Qt::AlignHCenter);
     QCOMPARE(cursor.block().text(), QString("blah"));
 }
 
@@ -1449,7 +1451,7 @@ void tst_QTextCursor::insertFragmentShouldUseCurrentCharFormat()
     cursor.insertFragment(fragment);
     cursor.movePosition(QTextCursor::Start);
     cursor.movePosition(QTextCursor::NextCharacter);
-    QVERIFY(cursor.charFormat() == fmt);
+    QCOMPARE(cursor.charFormat(), fmt);
 }
 
 int tst_QTextCursor::blockCount()
@@ -1910,15 +1912,15 @@ void tst_QTextCursor::cursorPositionWithBlockUndoAndRedo()
     int cursorPositionAfter = cursor.position();
     cursor.endEditBlock();
 
-    QVERIFY(doc->toPlainText() == "*AAAA*BBBB*CCCC*DDDD");
+    QCOMPARE(doc->toPlainText(), QLatin1String("*AAAA*BBBB*CCCC*DDDD"));
     QCOMPARE(12, cursorPositionBefore);
     QCOMPARE(1, cursorPositionAfter);
 
     doc->undo(&cursor);
-    QVERIFY(doc->toPlainText() == "AAAABBBBCCCCDDDD");
+    QCOMPARE(doc->toPlainText(), QLatin1String("AAAABBBBCCCCDDDD"));
     QCOMPARE(cursor.position(), cursorPositionBefore);
     doc->redo(&cursor);
-    QVERIFY(doc->toPlainText() == "*AAAA*BBBB*CCCC*DDDD");
+    QCOMPARE(doc->toPlainText(), QLatin1String("*AAAA*BBBB*CCCC*DDDD"));
     QCOMPARE(cursor.position(), cursorPositionAfter);
 }
 
@@ -1932,11 +1934,11 @@ void tst_QTextCursor::cursorPositionWithBlockUndoAndRedo2()
     cursor.insertText("AAAABBBBCCCCDDDD");
     cursor.endEditBlock();
     doc->undo(&cursor);
-    QVERIFY(doc->toPlainText() == "AAAABBBB");
+    QCOMPARE(doc->toPlainText(), QLatin1String("AAAABBBB"));
     QCOMPARE(cursor.position(), cursorPositionBefore);
 
     cursor.insertText("CCCC");
-    QVERIFY(doc->toPlainText() == "AAAABBBBCCCC");
+    QCOMPARE(doc->toPlainText(), QLatin1String("AAAABBBBCCCC"));
 
     cursorPositionBefore = cursor.position();
     cursor.setPosition(0, QTextCursor::KeepAnchor);
@@ -1951,7 +1953,7 @@ void tst_QTextCursor::cursorPositionWithBlockUndoAndRedo2()
     doc->undo(&cursor);
 
 
-    QVERIFY(doc->toPlainText() == "AAAABBBBCCCC");
+    QCOMPARE(doc->toPlainText(), QLatin1String("AAAABBBBCCCC"));
     QCOMPARE(cursor.position(), cursorPositionBefore);
 }
 
diff --git a/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp b/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp
index 5e6b606d83..7378ca85ee 100644
--- a/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp
+++ b/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp
@@ -744,7 +744,7 @@ void tst_QTextDocument::mightBeRichText()
 {
     QFETCH(QString, input);
     QFETCH(bool, result);
-    QVERIFY(result == Qt::mightBeRichText(input));
+    QCOMPARE(result, Qt::mightBeRichText(input));
 }
 
 Q_DECLARE_METATYPE(QTextDocumentFragment)
@@ -2222,7 +2222,7 @@ void tst_QTextDocument::clonePreservesUserStates()
         b2 = b2.next();
         QCOMPARE(b1.userState(), b2.userState());
     }
-    QVERIFY(b2 == clone->end());
+    QCOMPARE(b2, clone->end());
     delete clone;
 }
 
@@ -2269,7 +2269,7 @@ void tst_QTextDocument::resolvedFontInEmptyFormat()
     doc->setDefaultFont(font);
     QTextCharFormat fmt = doc->begin().charFormat();
     QVERIFY(fmt.properties().isEmpty());
-    QVERIFY(fmt.font() == font);
+    QCOMPARE(fmt.font(), font);
 }
 
 void tst_QTextDocument::defaultRootFrameMargin()
@@ -2369,6 +2369,7 @@ void tst_QTextDocument::deleteTextObjectsOnClear()
 
 void tst_QTextDocument::defaultStyleSheet()
 {
+    const QColor green("green");
     const QString sheet("p { background-color: green; }");
     QVERIFY(doc->defaultStyleSheet().isEmpty());
     doc->setDefaultStyleSheet(sheet);
@@ -2376,30 +2377,30 @@ void tst_QTextDocument::defaultStyleSheet()
 
     cursor.insertHtml("<p>test");
     QTextBlockFormat fmt = doc->begin().blockFormat();
-    QVERIFY(fmt.background().color() == QColor("green"));
+    QCOMPARE(fmt.background().color(), green);
 
     doc->clear();
     cursor.insertHtml("<p>test");
     fmt = doc->begin().blockFormat();
-    QVERIFY(fmt.background().color() == QColor("green"));
+    QCOMPARE(fmt.background().color(), green);
 
     QTextDocument *clone = doc->clone();
     QCOMPARE(clone->defaultStyleSheet(), sheet);
     cursor = QTextCursor(clone);
     cursor.insertHtml("<p>test");
     fmt = clone->begin().blockFormat();
-    QVERIFY(fmt.background().color() == QColor("green"));
+    QCOMPARE(fmt.background().color(), green);
     delete clone;
 
     cursor = QTextCursor(doc);
     cursor.insertHtml("<p>test");
     fmt = doc->begin().blockFormat();
-    QVERIFY(fmt.background().color() == QColor("green"));
+    QCOMPARE(fmt.background().color(), green);
 
     doc->clear();
     cursor.insertHtml("<style>p { background-color: red; }</style><p>test");
     fmt = doc->begin().blockFormat();
-    QVERIFY(fmt.background().color() == QColor("red"));
+    QCOMPARE(fmt.background().color(), QColor(Qt::red));
 
     doc->clear();
     doc->setDefaultStyleSheet("invalid style sheet....");
@@ -2567,7 +2568,7 @@ void tst_QTextDocument::setTextPreservesUndoRedoEnabled()
 void tst_QTextDocument::firstLast()
 {
     QCOMPARE(doc->blockCount(), 1);
-    QVERIFY(doc->firstBlock() == doc->lastBlock());
+    QCOMPARE(doc->firstBlock(), doc->lastBlock());
 
     doc->setPlainText("Hello\nTest\nWorld");
 
@@ -3013,8 +3014,8 @@ void tst_QTextDocument::QTBUG27354_spaceAndSoftSpace()
         QTextBlock block = td.begin();
         while (block.isValid()) {
             QTextBlockFormat fmt = block.blockFormat();
-            QVERIFY(fmt.lineHeightType() == QTextBlockFormat::SingleHeight);
-            QVERIFY(fmt.lineHeight() == 0);
+            QCOMPARE(fmt.lineHeightType(), int(QTextBlockFormat::SingleHeight));
+            QCOMPARE(fmt.lineHeight(), qreal(0));
             block = block.next();
         }
     }
@@ -3164,8 +3165,8 @@ void tst_QTextDocument::cssInheritance()
         QTextBlock block = td.begin();
         while (block.isValid()) {
             QTextBlockFormat fmt = block.blockFormat();
-            QVERIFY(fmt.lineHeightType() == QTextBlockFormat::ProportionalHeight);
-            QVERIFY(fmt.lineHeight() == 200);
+            QCOMPARE(fmt.lineHeightType(), int(QTextBlockFormat::ProportionalHeight));
+            QCOMPARE(fmt.lineHeight(), qreal(200));
             block = block.next();
         }
     }
@@ -3175,12 +3176,12 @@ void tst_QTextDocument::cssInheritance()
                    "<p style=\"line-height: 40px\">Foo</p><p>Bar</p><p>Baz</p></body></html>");
         QTextBlock block = td.begin();
         QTextBlockFormat fmt = block.blockFormat();
-        QVERIFY(fmt.lineHeightType() == QTextBlockFormat::FixedHeight);
-        QVERIFY(fmt.lineHeight() == 40);
+        QCOMPARE(fmt.lineHeightType(), int(QTextBlockFormat::FixedHeight));
+        QCOMPARE(fmt.lineHeight(), qreal(40));
         block = block.next();
         fmt = block.blockFormat();
-        QVERIFY(fmt.lineHeightType() == QTextBlockFormat::ProportionalHeight);
-        QVERIFY(fmt.lineHeight() == 300);
+        QCOMPARE(fmt.lineHeightType(), int(QTextBlockFormat::ProportionalHeight));
+        QCOMPARE(fmt.lineHeight(), qreal(300));
     }
     {
         QTextDocument td;
@@ -3188,7 +3189,7 @@ void tst_QTextDocument::cssInheritance()
             "<p>Foo</p><p>Bar</p><p>Baz</p></body></html>");
         QTextBlock block = td.begin();
         while (block.isValid()) {
-            QVERIFY(block.blockFormat().background() == QBrush());
+            QCOMPARE(block.blockFormat().background(), QBrush());
             QVERIFY(block.charFormat().font().bold());
             block = block.next();
         }
diff --git a/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp b/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp
index ccf4b6d82c..1cd9d9bcbe 100644
--- a/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp
+++ b/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp
@@ -727,7 +727,7 @@ void tst_QTextDocumentFragment::html_listIndents5()
     QCOMPARE(list->format().indent(), 1);
 
     cursor.movePosition(QTextCursor::NextBlock);
-    QVERIFY(cursor.currentList() == list);
+    QCOMPARE(cursor.currentList(), list);
     QCOMPARE(cursor.blockFormat().indent(), 0);
 }
 
@@ -778,7 +778,7 @@ void tst_QTextDocumentFragment::blockCharFormatCopied()
     cleanup();
     init();
     cursor.insertFragment(frag);
-    QVERIFY(cursor.blockCharFormat() == fmt);
+    QCOMPARE(cursor.blockCharFormat(), fmt);
 }
 
 void tst_QTextDocumentFragment::initialBlock()
@@ -794,19 +794,19 @@ void tst_QTextDocumentFragment::clone()
     mod.setAlignment(Qt::AlignCenter);
     cursor.mergeBlockFormat(mod);
     cursor.insertText("Blah");
-    QVERIFY(cursor.blockFormat().alignment() == Qt::AlignCenter);
+    QCOMPARE(cursor.blockFormat().alignment(), Qt::AlignCenter);
     QTextDocumentFragment frag(doc);
     cleanup();
     init();
     cursor.insertFragment(frag);
     cursor.movePosition(QTextCursor::Start);
-    QVERIFY(cursor.blockFormat().alignment() == Qt::AlignCenter);
+    QCOMPARE(cursor.blockFormat().alignment(), Qt::AlignCenter);
 }
 
 void tst_QTextDocumentFragment::dontRemoveInitialBlockIfItHoldsObjectIndexedCharFormat()
 {
     const char html[] = "<table><tr><td>cell one<td>cell two</tr><tr><td>cell three<td>cell four</tr></table>";
-    QVERIFY(doc->begin().charFormat().objectIndex() == -1);
+    QCOMPARE(doc->begin().charFormat().objectIndex(), -1);
     setHtml(QString::fromLatin1(html));
     int cnt = 0;
 
@@ -841,13 +841,13 @@ void tst_QTextDocumentFragment::unorderedListEnumeration()
     setHtml(QString::fromLatin1(html));
     cursor.movePosition(QTextCursor::End);
     QVERIFY(cursor.currentList());
-    QVERIFY(cursor.currentList()->format().style() == QTextListFormat::ListDisc);
+    QCOMPARE(cursor.currentList()->format().style(), QTextListFormat::ListDisc);
 
     const char html2[] = "<ul><ul><ul type=circle><li>Blah</li></ul></ul>";
     setHtml(QString::fromLatin1(html2));
     cursor.movePosition(QTextCursor::End);
     QVERIFY(cursor.currentList());
-    QVERIFY(cursor.currentList()->format().style() == QTextListFormat::ListCircle);
+    QCOMPARE(cursor.currentList()->format().style(), QTextListFormat::ListCircle);
 
 }
 
@@ -982,7 +982,7 @@ void tst_QTextDocumentFragment::cellBlockCount()
 
     int blockCount = 0;
     for (QTextFrame::iterator it = cell.begin(); !it.atEnd(); ++it) {
-        QVERIFY(it.currentFrame() == 0);
+        QVERIFY(!it.currentFrame());
         QVERIFY(it.currentBlock().isValid());
         ++blockCount;
     }
@@ -1003,7 +1003,7 @@ void tst_QTextDocumentFragment::cellBlockCount2()
 
     int blockCount = 0;
     for (QTextFrame::iterator it = cell.begin(); !it.atEnd(); ++it) {
-        QVERIFY(it.currentFrame() == 0);
+        QVERIFY(!it.currentFrame());
         QVERIFY(it.currentBlock().isValid());
         ++blockCount;
     }
@@ -1037,7 +1037,7 @@ void tst_QTextDocumentFragment::emptyTable3()
     QCOMPARE(table->columns(), 2);
     QTextTableCell cell = table->cellAt(0, 0);
     QVERIFY(cell.isValid());
-    QVERIFY(cell.firstPosition() == cell.lastPosition());
+    QCOMPARE(cell.firstPosition(), cell.lastPosition());
     cell = table->cellAt(0, 1);
     QTextCursor cursor = cell.firstCursorPosition();
     cursor.setPosition(cell.lastPosition(), QTextCursor::KeepAnchor);
@@ -1065,7 +1065,7 @@ void tst_QTextDocumentFragment::inheritAlignment()
     const char html[] = "<body align=right><p>Hey";
     setHtml(QString::fromLatin1(html));
     // html alignment is absolute
-    QVERIFY(doc->begin().blockFormat().alignment() == Qt::Alignment(Qt::AlignRight|Qt::AlignAbsolute));
+    QCOMPARE(doc->begin().blockFormat().alignment(), Qt::Alignment(Qt::AlignRight|Qt::AlignAbsolute));
 }
 
 void tst_QTextDocumentFragment::dontEmitEmptyNodeWhenEmptyTagIsFollowedByCloseTag()
@@ -1073,8 +1073,8 @@ void tst_QTextDocumentFragment::dontEmitEmptyNodeWhenEmptyTagIsFollowedByCloseTa
     // make sure the Hey does not end up as tag text for the img tag
     const char html[] = "<body align=right><p align=left>Blah<img></img><p>Hey";
     setHtml(QString::fromLatin1(html));
-    QVERIFY(doc->begin().blockFormat().alignment() == Qt::Alignment(Qt::AlignLeft|Qt::AlignAbsolute));
-    QVERIFY(doc->begin().next().blockFormat().alignment() == Qt::Alignment(Qt::AlignRight|Qt::AlignAbsolute));
+    QCOMPARE(doc->begin().blockFormat().alignment(), Qt::Alignment(Qt::AlignLeft|Qt::AlignAbsolute));
+    QCOMPARE(doc->begin().next().blockFormat().alignment(), Qt::Alignment(Qt::AlignRight|Qt::AlignAbsolute));
 }
 
 void tst_QTextDocumentFragment::toPlainText()
@@ -1480,19 +1480,19 @@ void tst_QTextDocumentFragment::html_subAndSuperScript()
     const char alignmentInherited[] = "<sub><font face=\"Verdana\">Subby</font></sub>";
 
     setHtml(subHtml);
-    QVERIFY(cursor.charFormat().verticalAlignment() == QTextCharFormat::AlignSubScript);
+    QCOMPARE(cursor.charFormat().verticalAlignment(), QTextCharFormat::AlignSubScript);
 
     setHtml(subHtmlCss);
-    QVERIFY(cursor.charFormat().verticalAlignment() == QTextCharFormat::AlignSubScript);
+    QCOMPARE(cursor.charFormat().verticalAlignment(), QTextCharFormat::AlignSubScript);
 
     setHtml(superHtml);
-    QVERIFY(cursor.charFormat().verticalAlignment() == QTextCharFormat::AlignSuperScript);
+    QCOMPARE(cursor.charFormat().verticalAlignment(), QTextCharFormat::AlignSuperScript);
 
     setHtml(superHtmlCss);
-    QVERIFY(cursor.charFormat().verticalAlignment() == QTextCharFormat::AlignSuperScript);
+    QCOMPARE(cursor.charFormat().verticalAlignment(), QTextCharFormat::AlignSuperScript);
 
     setHtml(alignmentInherited);
-    QVERIFY(cursor.charFormat().verticalAlignment() == QTextCharFormat::AlignSubScript);
+    QCOMPARE(cursor.charFormat().verticalAlignment(), QTextCharFormat::AlignSubScript);
 }
 
 void tst_QTextDocumentFragment::html_cssColors()
@@ -1695,7 +1695,7 @@ void tst_QTextDocumentFragment::html_bodyBackground()
     const char html[] = "<body background=\"foo.png\">Foo</body>";
     doc->setHtml(html);
 
-    QVERIFY(doc->rootFrame()->frameFormat().background().style() == Qt::TexturePattern);
+    QCOMPARE(doc->rootFrame()->frameFormat().background().style(), Qt::TexturePattern);
 }
 
 void tst_QTextDocumentFragment::html_tableCellBackground()
@@ -1709,7 +1709,7 @@ void tst_QTextDocumentFragment::html_tableCellBackground()
     QVERIFY(table);
 
     QTextTableCell cell = table->cellAt(0, 0);
-    QVERIFY(cell.format().background().style() == Qt::TexturePattern);
+    QCOMPARE(cell.format().background().style(), Qt::TexturePattern);
 }
 
 void tst_QTextDocumentFragment::css_bodyBackground()
@@ -1717,7 +1717,7 @@ void tst_QTextDocumentFragment::css_bodyBackground()
     const char html[] = "<body style=\"background-image:url('foo.png')\">Foo</body>";
     doc->setHtml(html);
 
-    QVERIFY(doc->rootFrame()->frameFormat().background().style() == Qt::TexturePattern);
+    QCOMPARE(doc->rootFrame()->frameFormat().background().style(), Qt::TexturePattern);
 }
 
 void tst_QTextDocumentFragment::css_tableCellBackground()
@@ -1731,7 +1731,7 @@ void tst_QTextDocumentFragment::css_tableCellBackground()
     QVERIFY(table);
 
     QTextTableCell cell = table->cellAt(0, 0);
-    QVERIFY(cell.format().background().style() == Qt::TexturePattern);
+    QCOMPARE(cell.format().background().style(), Qt::TexturePattern);
 }
 
 void tst_QTextDocumentFragment::css_cellPaddings()
@@ -1767,7 +1767,7 @@ void tst_QTextDocumentFragment::html_blockLevelDiv()
     setHtml(html);
 
     QCOMPARE(doc->begin().blockFormat().alignment(), Qt::AlignRight|Qt::AlignAbsolute);
-    QVERIFY(doc->begin().next() == doc->end());
+    QCOMPARE(doc->begin().next(), doc->end());
 }
 
 void tst_QTextDocumentFragment::html_spanNesting()
@@ -1805,7 +1805,7 @@ void tst_QTextDocumentFragment::html_nestedLists()
     cursor.movePosition(QTextCursor::NextBlock);
     QTextList *thirdList = cursor.currentList();
     QVERIFY(thirdList);
-    QVERIFY(thirdList == firstList);
+    QCOMPARE(thirdList, firstList);
 }
 
 void tst_QTextDocumentFragment::noSpecialCharactersInPlainText()
@@ -2022,7 +2022,7 @@ void tst_QTextDocumentFragment::html_frameImport()
     cursor.insertFragment(frag);
 
     QList<QTextFrame *> childFrames = doc->rootFrame()->childFrames();
-    QVERIFY(childFrames.count() == 1);
+    QCOMPARE(childFrames.count(), 1);
     QTextFrame *frame = childFrames.first();
     QCOMPARE(frame->frameFormat().margin(), ffmt.margin());
     QCOMPARE(frame->frameFormat().border(), ffmt.border());
@@ -2050,7 +2050,7 @@ void tst_QTextDocumentFragment::html_frameImport2()
     cursor.insertFragment(frag);
 
     QList<QTextFrame *> childFrames = doc->rootFrame()->childFrames();
-    QVERIFY(childFrames.count() == 1);
+    QCOMPARE(childFrames.count(), 1);
     QTextFrame *frame = childFrames.first();
     QCOMPARE(frame->frameFormat().topMargin(), ffmt.topMargin());
     QCOMPARE(frame->frameFormat().bottomMargin(), ffmt.bottomMargin());
@@ -2065,7 +2065,7 @@ void tst_QTextDocumentFragment::html_dontAddMarginsAcrossTableCells()
     cursor.insertFragment(QTextDocumentFragment::fromHtml(QString::fromLatin1(html)));
 
     QList<QTextFrame *> childFrames = doc->rootFrame()->childFrames();
-    QVERIFY(childFrames.count() == 1);
+    QCOMPARE(childFrames.count(), 1);
     QTextFrame *frame = childFrames.first();
     cursor = frame->firstCursorPosition();
     QCOMPARE(cursor.blockFormat().leftMargin(), qreal(50.0));
@@ -2078,7 +2078,7 @@ void tst_QTextDocumentFragment::html_dontMergeCenterBlocks()
 
     QCOMPARE(doc->blockCount(), 2);
     QTextBlock blk = doc->begin();
-    QVERIFY(blk.blockFormat().alignment() == Qt::AlignCenter);
+    QCOMPARE(blk.blockFormat().alignment(), Qt::AlignCenter);
     blk = blk.next();
     QVERIFY(blk.blockFormat().alignment() != Qt::AlignCenter);
 }
@@ -2112,7 +2112,7 @@ void tst_QTextDocumentFragment::html_tableCellBgColor2()
 
     QTextFrame::Iterator it = cell.begin();
     QVERIFY(!it.atEnd());
-    QVERIFY(it.currentFrame() == 0);
+    QVERIFY(!it.currentFrame());
     QVERIFY(it.currentBlock().isValid());
 
     ++it;
@@ -2122,9 +2122,9 @@ void tst_QTextDocumentFragment::html_tableCellBgColor2()
 
     ++it;
     QVERIFY(!it.atEnd());
-    QVERIFY(it.currentFrame() == 0);
+    QVERIFY(!it.currentFrame());
     QVERIFY(it.currentBlock().isValid());
-    QVERIFY(it.currentBlock().blockFormat().background() == QBrush(Qt::NoBrush));
+    QCOMPARE(it.currentBlock().blockFormat().background(), QBrush(Qt::NoBrush));
 
     ++it;
     QVERIFY(it.atEnd());
@@ -2245,8 +2245,8 @@ void tst_QTextDocumentFragment::html_blockVsInline()
 {
     {
         setHtml("<html><body><div><b>Foo<div>Bar");
-        QVERIFY(cursor.charFormat().fontWeight() == QFont::Bold);
-        QVERIFY(cursor.blockCharFormat().fontWeight() == QFont::Bold);
+        QCOMPARE(cursor.charFormat().fontWeight(), int(QFont::Bold));
+        QCOMPARE(cursor.blockCharFormat().fontWeight(), int(QFont::Bold));
     }
     {
         setHtml("<html><body><p><b>Foo<p>Bar");
@@ -2255,23 +2255,23 @@ void tst_QTextDocumentFragment::html_blockVsInline()
     }
     {
         setHtml("<html><body><b><center>Foo</center></b>");
-        QVERIFY(cursor.charFormat().fontWeight() == QFont::Bold);
-        QVERIFY(cursor.blockCharFormat().fontWeight() == QFont::Bold);
+        QCOMPARE(cursor.charFormat().fontWeight(), int(QFont::Bold));
+        QCOMPARE(cursor.blockCharFormat().fontWeight(), int(QFont::Bold));
     }
     {
         setHtml("<html><body><b><p>Foo");
-        QVERIFY(cursor.charFormat().fontWeight() == QFont::Bold);
-        QVERIFY(cursor.blockCharFormat().fontWeight() == QFont::Bold);
+        QCOMPARE(cursor.charFormat().fontWeight(), int(QFont::Bold));
+        QCOMPARE(cursor.blockCharFormat().fontWeight(), int(QFont::Bold));
     }
     {
         setHtml("<html><body><b><p>Foo<p>Bar");
-        QVERIFY(cursor.charFormat().fontWeight() == QFont::Bold);
-        QVERIFY(cursor.blockCharFormat().fontWeight() == QFont::Bold);
+        QCOMPARE(cursor.charFormat().fontWeight(), int(QFont::Bold));
+        QCOMPARE(cursor.blockCharFormat().fontWeight(), int(QFont::Bold));
     }
     {
         setHtml("<div><b>Foo<div>Bar");
-        QVERIFY(cursor.charFormat().fontWeight() == QFont::Bold);
-        QVERIFY(cursor.blockCharFormat().fontWeight() == QFont::Bold);
+        QCOMPARE(cursor.charFormat().fontWeight(), int(QFont::Bold));
+        QCOMPARE(cursor.blockCharFormat().fontWeight(), int(QFont::Bold));
     }
     {
         setHtml("<p><b>Foo<p>Bar");
@@ -2280,18 +2280,18 @@ void tst_QTextDocumentFragment::html_blockVsInline()
     }
     {
         setHtml("<b><center>Foo</center></b>");
-        QVERIFY(cursor.charFormat().fontWeight() == QFont::Bold);
-        QVERIFY(cursor.blockCharFormat().fontWeight() == QFont::Bold);
+        QCOMPARE(cursor.charFormat().fontWeight(), int(QFont::Bold));
+        QCOMPARE(cursor.blockCharFormat().fontWeight(), int(QFont::Bold));
     }
     {
         setHtml("<b><p>Foo");
-        QVERIFY(cursor.charFormat().fontWeight() == QFont::Bold);
-        QVERIFY(cursor.blockCharFormat().fontWeight() == QFont::Bold);
+        QCOMPARE(cursor.charFormat().fontWeight(), int(QFont::Bold));
+        QCOMPARE(cursor.blockCharFormat().fontWeight(), int(QFont::Bold));
     }
     {
         setHtml("<b><p>Foo<p>Bar");
-        QVERIFY(cursor.charFormat().fontWeight() == QFont::Bold);
-        QVERIFY(cursor.blockCharFormat().fontWeight() == QFont::Bold);
+        QCOMPARE(cursor.charFormat().fontWeight(), int(QFont::Bold));
+        QCOMPARE(cursor.blockCharFormat().fontWeight(), int(QFont::Bold));
     }
 }
 
@@ -2338,7 +2338,7 @@ void tst_QTextDocumentFragment::html_nestedTables()
 
     QTextTable *firstNestedTable = cursor.currentTable();
     QVERIFY(firstNestedTable);
-    QVERIFY(firstNestedTable->parentFrame() == table);
+    QCOMPARE(firstNestedTable->parentFrame(), table);
     QCOMPARE(firstNestedTable->rows(), 1);
     QCOMPARE(firstNestedTable->columns(), 1);
     QCOMPARE(firstNestedTable->cellAt(0, 0).firstCursorPosition().block().text(), QString("Hello"));
@@ -2348,13 +2348,13 @@ void tst_QTextDocumentFragment::html_nestedTables()
         ;
 
     QVERIFY(!cursor.isNull());
-    QVERIFY(cursor.currentTable() == table);
+    QCOMPARE(cursor.currentTable(), table);
 
     cursor.movePosition(QTextCursor::NextBlock);
 
     QTextTable *secondNestedTable = cursor.currentTable();
     QVERIFY(secondNestedTable);
-    QVERIFY(secondNestedTable->parentFrame() == table);
+    QCOMPARE(secondNestedTable->parentFrame(), table);
     QCOMPARE(secondNestedTable->rows(), 1);
     QCOMPARE(secondNestedTable->columns(), 1);
     QCOMPARE(secondNestedTable->cellAt(0, 0).firstCursorPosition().block().text(), QString("World"));
@@ -2454,7 +2454,7 @@ void tst_QTextDocumentFragment::html_anchorColor()
     setHtml("<span style=\"color: red;\"><a href=\"http://www.kde.org/\">Blue</a></span>");
     cursor.movePosition(QTextCursor::Start);
     cursor.movePosition(QTextCursor::NextCharacter);
-    QVERIFY(cursor.charFormat().foreground().color() == QGuiApplication::palette().link().color());
+    QCOMPARE(cursor.charFormat().foreground().color(), QGuiApplication::palette().link().color());
 
     setHtml("<span style=\"color: red;\"><a href=\"http://www.kde.org/\" style=\"color: yellow;\">Green</a></span>");
     cursor.movePosition(QTextCursor::Start);
@@ -2525,17 +2525,17 @@ void tst_QTextDocumentFragment::html_columnWidths()
 
     const QVector<QTextLength> columnWidths = fmt.columnWidthConstraints();
     QCOMPARE(columnWidths.count(), 2);
-    QVERIFY(columnWidths.at(0).type() == QTextLength::VariableLength);
-    QVERIFY(columnWidths.at(1).type() == QTextLength::PercentageLength);
-    QVERIFY(columnWidths.at(1).rawValue() == 1);
+    QCOMPARE(columnWidths.at(0).type(), QTextLength::VariableLength);
+    QCOMPARE(columnWidths.at(1).type(), QTextLength::PercentageLength);
+    QCOMPARE(columnWidths.at(1).rawValue(), qreal(1));
 }
 
 void tst_QTextDocumentFragment::css_fontWeight()
 {
     setHtml("<p style=\"font-weight:bold\">blah</p>");
-    QVERIFY(doc->begin().charFormat().fontWeight() == QFont::Bold);
+    QCOMPARE(doc->begin().charFormat().fontWeight(), int(QFont::Bold));
     setHtml("<p style=\"font-weight:600\">blah</p>");
-    QVERIFY(doc->begin().charFormat().fontWeight() == QFont::Bold);
+    QCOMPARE(doc->begin().charFormat().fontWeight(), int(QFont::Bold));
 
 }
 
@@ -2548,7 +2548,7 @@ void tst_QTextDocumentFragment::css_float()
     QVERIFY(o);
     QTextFormat f = o->format();
     QVERIFY(f.isFrameFormat());
-    QVERIFY(f.toFrameFormat().position() == QTextFrameFormat::FloatRight);
+    QCOMPARE(f.toFrameFormat().position(), QTextFrameFormat::FloatRight);
 
     setHtml("<img src=\"foo\" align=right>");
     fmt = doc->begin().begin().fragment().charFormat();
@@ -2557,7 +2557,7 @@ void tst_QTextDocumentFragment::css_float()
     QVERIFY(o);
     f = o->format();
     QVERIFY(f.isFrameFormat());
-    QVERIFY(f.toFrameFormat().position() == QTextFrameFormat::FloatRight);
+    QCOMPARE(f.toFrameFormat().position(), QTextFrameFormat::FloatRight);
 
     setHtml("<img src=\"foo\" align=left>");
     fmt = doc->begin().begin().fragment().charFormat();
@@ -2566,7 +2566,7 @@ void tst_QTextDocumentFragment::css_float()
     QVERIFY(o);
     f = o->format();
     QVERIFY(f.isFrameFormat());
-    QVERIFY(f.toFrameFormat().position() == QTextFrameFormat::FloatLeft);
+    QCOMPARE(f.toFrameFormat().position(), QTextFrameFormat::FloatLeft);
 }
 
 void tst_QTextDocumentFragment::css_textIndent()
@@ -2585,7 +2585,7 @@ void tst_QTextDocumentFragment::css_inline()
             "<p>test</p>"
             );
     QTextBlockFormat fmt = doc->begin().blockFormat();
-    QVERIFY(fmt.background().color() == QColor("green"));
+    QCOMPARE(fmt.background().color(), QColor("green"));
 }
 
 void tst_QTextDocumentFragment::css_external()
@@ -2596,11 +2596,12 @@ void tst_QTextDocumentFragment::css_external()
             "<p>test</p>"
             );
     QTextBlockFormat fmt = doc->begin().blockFormat();
-    QVERIFY(fmt.background().color() == QColor("green"));
+    QCOMPARE(fmt.background().color(), QColor("green"));
 }
 
 void tst_QTextDocumentFragment::css_import()
 {
+    const QColor green("green");
     doc->addResource(QTextDocument::StyleSheetResource, QUrl("test.css"), QString("@import \"other.css\";"));
     doc->addResource(QTextDocument::StyleSheetResource, QUrl("other.css"), QString("@import url(\"other2.css\");"));
     doc->addResource(QTextDocument::StyleSheetResource, QUrl("other2.css"), QString("p { background-color: green; }"));
@@ -2609,14 +2610,14 @@ void tst_QTextDocumentFragment::css_import()
             "<p>test</p>"
             );
     QTextBlockFormat fmt = doc->begin().blockFormat();
-    QVERIFY(fmt.background().color() == QColor("green"));
+    QCOMPARE(fmt.background().color(), green);
 
     doc->setHtml(""
             "<style>@import \"test.css\" screen;</style>"
             "<p>test</p>"
             );
     fmt = doc->begin().blockFormat();
-    QVERIFY(fmt.background().color() == QColor("green"));
+    QCOMPARE(fmt.background().color(), green);
 }
 
 void tst_QTextDocumentFragment::css_selectors_data()
@@ -2662,9 +2663,9 @@ void tst_QTextDocumentFragment::css_selectors()
 
     QTextBlockFormat fmt = doc->begin().blockFormat();
     if (match)
-        QVERIFY(fmt.background().color() == QColor("red"));
+        QCOMPARE(fmt.background().color(), QColor("red"));
     else
-        QVERIFY(fmt.background().color() == QColor("green"));
+        QCOMPARE(fmt.background().color(), QColor("green"));
 }
 
 void tst_QTextDocumentFragment::css_nodeNameCaseInsensitivity()
@@ -2674,7 +2675,7 @@ void tst_QTextDocumentFragment::css_nodeNameCaseInsensitivity()
             "</style>"
             "<p>test</p>");
     QTextBlockFormat fmt = doc->begin().blockFormat();
-    QVERIFY(fmt.background().color() == QColor("green"));
+    QCOMPARE(fmt.background().color(), QColor("green"));
 }
 
 void tst_QTextDocumentFragment::css_textUnderlineStyle_data()
@@ -2710,14 +2711,14 @@ void tst_QTextDocumentFragment::css_textUnderlineStyleAndDecoration()
 
     QTextFragment fragment = doc->begin().begin().fragment();
     QVERIFY(fragment.isValid());
-    QVERIFY(fragment.charFormat().underlineStyle() == QTextCharFormat::SingleUnderline);
+    QCOMPARE(fragment.charFormat().underlineStyle(), QTextCharFormat::SingleUnderline);
     QVERIFY(fragment.charFormat().fontOverline());
 
     doc->setHtml("<span style=\"text-underline-style: solid; text-decoration: overline\">Test</span>");
 
     fragment = doc->begin().begin().fragment();
     QVERIFY(fragment.isValid());
-    QVERIFY(fragment.charFormat().underlineStyle() == QTextCharFormat::SingleUnderline);
+    QCOMPARE(fragment.charFormat().underlineStyle(), QTextCharFormat::SingleUnderline);
     QVERIFY(fragment.charFormat().fontOverline());
 }
 
@@ -2726,48 +2727,48 @@ void tst_QTextDocumentFragment::css_listStyleType()
     doc->setHtml("<ol style=\"list-style-type: disc\"><li>Blah</li></ol>");
     cursor.movePosition(QTextCursor::End);
     QVERIFY(cursor.currentList());
-    QVERIFY(cursor.currentList()->format().style() == QTextListFormat::ListDisc);
+    QCOMPARE(cursor.currentList()->format().style(), QTextListFormat::ListDisc);
 
     doc->setHtml("<ul style=\"list-style-type: square\"><li>Blah</li></ul>");
     cursor.movePosition(QTextCursor::End);
     QVERIFY(cursor.currentList());
-    QVERIFY(cursor.currentList()->format().style() == QTextListFormat::ListSquare);
+    QCOMPARE(cursor.currentList()->format().style(), QTextListFormat::ListSquare);
 
     doc->setHtml("<ul style=\"list-style-type: circle\"><li>Blah</li></ul>");
     cursor.movePosition(QTextCursor::End);
     QVERIFY(cursor.currentList());
-    QVERIFY(cursor.currentList()->format().style() == QTextListFormat::ListCircle);
+    QCOMPARE(cursor.currentList()->format().style(), QTextListFormat::ListCircle);
 
     doc->setHtml("<ul style=\"list-style-type: decimal\"><li>Blah</li></ul>");
     cursor.movePosition(QTextCursor::End);
     QVERIFY(cursor.currentList());
-    QVERIFY(cursor.currentList()->format().style() == QTextListFormat::ListDecimal);
+    QCOMPARE(cursor.currentList()->format().style(), QTextListFormat::ListDecimal);
 
     doc->setHtml("<ul style=\"list-style-type: lower-alpha\"><li>Blah</li></ul>");
     cursor.movePosition(QTextCursor::End);
     QVERIFY(cursor.currentList());
-    QVERIFY(cursor.currentList()->format().style() == QTextListFormat::ListLowerAlpha);
+    QCOMPARE(cursor.currentList()->format().style(), QTextListFormat::ListLowerAlpha);
 
     doc->setHtml("<ul style=\"list-style-type: upper-alpha\"><li>Blah</li></ul>");
     cursor.movePosition(QTextCursor::End);
     QVERIFY(cursor.currentList());
-    QVERIFY(cursor.currentList()->format().style() == QTextListFormat::ListUpperAlpha);
+    QCOMPARE(cursor.currentList()->format().style(), QTextListFormat::ListUpperAlpha);
 
     doc->setHtml("<ul style=\"list-style-type: upper-roman\"><li>Blah</li></ul>");
     cursor.movePosition(QTextCursor::End);
     QVERIFY(cursor.currentList());
-    QVERIFY(cursor.currentList()->format().style() == QTextListFormat::ListUpperRoman);
+    QCOMPARE(cursor.currentList()->format().style(), QTextListFormat::ListUpperRoman);
 
     doc->setHtml("<ul style=\"list-style-type: lower-roman\"><li>Blah</li></ul>");
     cursor.movePosition(QTextCursor::End);
     QVERIFY(cursor.currentList());
-    QVERIFY(cursor.currentList()->format().style() == QTextListFormat::ListLowerRoman);
+    QCOMPARE(cursor.currentList()->format().style(), QTextListFormat::ListLowerRoman);
 
     // ignore the unsupported list-style-position inside the list-style shorthand property
     doc->setHtml("<ul style=\"list-style: outside decimal\"><li>Blah</li></ul>");
     cursor.movePosition(QTextCursor::End);
     QVERIFY(cursor.currentList());
-    QVERIFY(cursor.currentList()->format().style() == QTextListFormat::ListDecimal);
+    QCOMPARE(cursor.currentList()->format().style(), QTextListFormat::ListDecimal);
 }
 
 void tst_QTextDocumentFragment::css_linkPseudo()
@@ -2785,13 +2786,13 @@ void tst_QTextDocumentFragment::css_linkPseudo()
 void tst_QTextDocumentFragment::css_pageBreaks()
 {
     doc->setHtml("<p>Foo</p>");
-    QVERIFY(doc->begin().blockFormat().pageBreakPolicy() == QTextFormat::PageBreak_Auto);
+    QCOMPARE(doc->begin().blockFormat().pageBreakPolicy(), QTextFormat::PageBreak_Auto);
 
     doc->setHtml("<p style=\" page-break-before:always;\">Foo</p>");
-    QVERIFY(doc->begin().blockFormat().pageBreakPolicy() == QTextFormat::PageBreak_AlwaysBefore);
+    QCOMPARE(doc->begin().blockFormat().pageBreakPolicy(), QTextFormat::PageBreak_AlwaysBefore);
 
     doc->setHtml("<p style=\" page-break-after:always;\">Foo</p>");
-    QVERIFY(doc->begin().blockFormat().pageBreakPolicy() == QTextFormat::PageBreak_AlwaysAfter);
+    QCOMPARE(doc->begin().blockFormat().pageBreakPolicy(), QTextFormat::PageBreak_AlwaysAfter);
 
     doc->setHtml("<p style=\" page-break-before:always; page-break-after:always;\">Foo</p>");
     QVERIFY(doc->begin().blockFormat().pageBreakPolicy() == (QTextFormat::PageBreak_AlwaysAfter | QTextFormat::PageBreak_AlwaysBefore));
@@ -2832,13 +2833,14 @@ void tst_QTextDocumentFragment::universalSelectors()
 
     QTextBlockFormat fmt = doc->begin().blockFormat();
     if (match)
-        QVERIFY(fmt.background().color() == QColor("green"));
+        QCOMPARE(fmt.background().color(), QColor("green"));
     else
         QVERIFY(!fmt.hasProperty(QTextFormat::BackgroundBrush));
 }
 
 void tst_QTextDocumentFragment::screenMedia()
 {
+    const QColor green("green");
     setHtml("<style>"
             "@media screen {"
             "p { background-color: green }"
@@ -2847,7 +2849,7 @@ void tst_QTextDocumentFragment::screenMedia()
             "<p>test</p>"
             "");
     QTextBlockFormat fmt = doc->begin().blockFormat();
-    QVERIFY(fmt.background().color() == QColor("green"));
+    QCOMPARE(fmt.background().color(), green);
 
     setHtml("<style>"
             "@media foobar {"
@@ -2857,7 +2859,7 @@ void tst_QTextDocumentFragment::screenMedia()
             "<p>test</p>"
             "");
     fmt = doc->begin().blockFormat();
-    QVERIFY(fmt.background().color() != QColor("green"));
+    QVERIFY(fmt.background().color() != green);
 
     setHtml("<style>"
             "@media sCrEeN {"
@@ -2867,7 +2869,7 @@ void tst_QTextDocumentFragment::screenMedia()
             "<p>test</p>"
             "");
     fmt = doc->begin().blockFormat();
-    QVERIFY(fmt.background().color() == QColor("green"));
+    QCOMPARE(fmt.background().color(), green);
 }
 
 void tst_QTextDocumentFragment::htmlResourceLoading()
@@ -2881,7 +2883,7 @@ void tst_QTextDocumentFragment::htmlResourceLoading()
     doc->clear();
     QTextCursor(doc).insertFragment(frag);
     QTextBlockFormat fmt = doc->begin().blockFormat();
-    QVERIFY(fmt.background().color() == QColor("green"));
+    QCOMPARE(fmt.background().color(), QColor("green"));
 }
 
 void tst_QTextDocumentFragment::someCaseInsensitiveAttributeValues()
@@ -2890,7 +2892,7 @@ void tst_QTextDocumentFragment::someCaseInsensitiveAttributeValues()
     setHtml(QString::fromLatin1(html1));
     cursor.movePosition(QTextCursor::End);
     QVERIFY(cursor.currentList());
-    QVERIFY(cursor.currentList()->format().style() == QTextListFormat::ListSquare);
+    QCOMPARE(cursor.currentList()->format().style(), QTextListFormat::ListSquare);
 
     const char html2[] = "<div align=ceNTeR><b>Hello World";
     setHtml(html2);
@@ -2925,7 +2927,7 @@ void tst_QTextDocumentFragment::backgroundImage()
     doc.testPixmap.fill(Qt::blue);
     doc.setHtml("<p style=\"background-image: url(testPixmap)\">Hello</p>");
     QBrush bg = doc.begin().blockFormat().background();
-    QVERIFY(bg.style() == Qt::TexturePattern);
+    QCOMPARE(bg.style(), Qt::TexturePattern);
     QCOMPARE(bg.texture().cacheKey(), doc.testPixmap.cacheKey());
 }
 
@@ -3109,7 +3111,7 @@ void tst_QTextDocumentFragment::html_tableStrangeNewline()
     QCOMPARE(table->columns(), 1);
     const QTextTableCell cell = table->cellAt(0, 0);
     QCOMPARE(cell.firstCursorPosition().block().text(), QString("Foo"));
-    QVERIFY(cell.firstCursorPosition().block() == cell.lastCursorPosition().block());
+    QCOMPARE(cell.firstCursorPosition().block(), cell.lastCursorPosition().block());
 }
 
 void tst_QTextDocumentFragment::html_tableStrangeNewline2()
@@ -3123,7 +3125,7 @@ void tst_QTextDocumentFragment::html_tableStrangeNewline2()
     QCOMPARE(table->columns(), 1);
     const QTextTableCell cell = table->cellAt(0, 0);
     QCOMPARE(cell.firstCursorPosition().block().text(), QString("Foo"));
-    QVERIFY(cell.firstCursorPosition().block() == cell.lastCursorPosition().block());
+    QCOMPARE(cell.firstCursorPosition().block(), cell.lastCursorPosition().block());
 }
 
 void tst_QTextDocumentFragment::html_tableStrangeNewline3()
@@ -3152,11 +3154,11 @@ void tst_QTextDocumentFragment::html_tableStrangeNewline3()
 
     QTextTableCell cell = table->cellAt(0, 0);
     QCOMPARE(cell.firstCursorPosition().block().text(), QString("Meh"));
-    QVERIFY(cell.firstCursorPosition().block() == cell.lastCursorPosition().block());
+    QCOMPARE(cell.firstCursorPosition().block(), cell.lastCursorPosition().block());
 
     cell = table->cellAt(0, 1);
     QCOMPARE(cell.firstCursorPosition().block().text(), QString("Foo"));
-    QVERIFY(cell.firstCursorPosition().block() == cell.lastCursorPosition().block());
+    QCOMPARE(cell.firstCursorPosition().block(), cell.lastCursorPosition().block());
 }
 
 void tst_QTextDocumentFragment::html_caption()
@@ -3170,7 +3172,7 @@ void tst_QTextDocumentFragment::html_caption()
     cursor.movePosition(QTextCursor::NextBlock);
 
     QCOMPARE(cursor.block().text(), QString("This is a Caption!"));
-    QVERIFY(cursor.blockFormat().alignment() == Qt::AlignHCenter);
+    QCOMPARE(cursor.blockFormat().alignment(), Qt::AlignHCenter);
 
     cursor.movePosition(QTextCursor::NextBlock);
     QTextTable *table = cursor.currentTable();
@@ -3427,7 +3429,7 @@ void tst_QTextDocumentFragment::html_dontInheritAlignmentForFloatingImages()
     QVERIFY(o);
     QTextFormat f = o->format();
     QVERIFY(f.isFrameFormat());
-    QVERIFY(f.toFrameFormat().position() == QTextFrameFormat::InFlow);
+    QCOMPARE(f.toFrameFormat().position(), QTextFrameFormat::InFlow);
 }
 
 void tst_QTextDocumentFragment::html_verticalImageAlignment()
@@ -3437,35 +3439,35 @@ void tst_QTextDocumentFragment::html_verticalImageAlignment()
     cursor.movePosition(QTextCursor::NextCharacter);
     QVERIFY(cursor.charFormat().isImageFormat());
     QTextImageFormat fmt = cursor.charFormat().toImageFormat();
-    QVERIFY(fmt.verticalAlignment() == QTextCharFormat::AlignNormal);
+    QCOMPARE(fmt.verticalAlignment(), QTextCharFormat::AlignNormal);
 
     doc->setHtml("<img src=\"foo\" align=middle />");
     cursor.movePosition(QTextCursor::Start);
     cursor.movePosition(QTextCursor::NextCharacter);
     QVERIFY(cursor.charFormat().isImageFormat());
     fmt = cursor.charFormat().toImageFormat();
-    QVERIFY(fmt.verticalAlignment() == QTextCharFormat::AlignMiddle);
+    QCOMPARE(fmt.verticalAlignment(), QTextCharFormat::AlignMiddle);
 
     doc->setHtml("<img src=\"foo\" style=\"vertical-align: middle\" />");
     cursor.movePosition(QTextCursor::Start);
     cursor.movePosition(QTextCursor::NextCharacter);
     QVERIFY(cursor.charFormat().isImageFormat());
     fmt = cursor.charFormat().toImageFormat();
-    QVERIFY(fmt.verticalAlignment() == QTextCharFormat::AlignMiddle);
+    QCOMPARE(fmt.verticalAlignment(), QTextCharFormat::AlignMiddle);
 
     doc->setHtml("<img src=\"foo\" align=top />");
     cursor.movePosition(QTextCursor::Start);
     cursor.movePosition(QTextCursor::NextCharacter);
     QVERIFY(cursor.charFormat().isImageFormat());
     fmt = cursor.charFormat().toImageFormat();
-    QVERIFY(fmt.verticalAlignment() == QTextCharFormat::AlignTop);
+    QCOMPARE(fmt.verticalAlignment(), QTextCharFormat::AlignTop);
 
     doc->setHtml("<img src=\"foo\" style=\"vertical-align: top\" />");
     cursor.movePosition(QTextCursor::Start);
     cursor.movePosition(QTextCursor::NextCharacter);
     QVERIFY(cursor.charFormat().isImageFormat());
     fmt = cursor.charFormat().toImageFormat();
-    QVERIFY(fmt.verticalAlignment() == QTextCharFormat::AlignTop);
+    QCOMPARE(fmt.verticalAlignment(), QTextCharFormat::AlignTop);
 }
 
 void tst_QTextDocumentFragment::html_verticalCellAlignment()
@@ -3944,11 +3946,11 @@ void tst_QTextDocumentFragment::html_directionWithHtml()
 
     block = block.next();
     QVERIFY(block.blockFormat().hasProperty(QTextFormat::LayoutDirection));
-    QVERIFY(block.blockFormat().layoutDirection() == Qt::RightToLeft);
+    QCOMPARE(block.blockFormat().layoutDirection(), Qt::RightToLeft);
 
     block = block.next();
     QVERIFY(block.blockFormat().hasProperty(QTextFormat::LayoutDirection));
-    QVERIFY(block.blockFormat().layoutDirection() == Qt::LeftToRight);
+    QCOMPARE(block.blockFormat().layoutDirection(), Qt::LeftToRight);
 }
 
 void tst_QTextDocumentFragment::html_directionWithRichText()
@@ -3961,11 +3963,11 @@ void tst_QTextDocumentFragment::html_directionWithRichText()
 
     block = block.next();
     QVERIFY(block.blockFormat().hasProperty(QTextFormat::LayoutDirection));
-    QVERIFY(block.blockFormat().layoutDirection() == Qt::RightToLeft);
+    QCOMPARE(block.blockFormat().layoutDirection(), Qt::RightToLeft);
 
     block = block.next();
     QVERIFY(block.blockFormat().hasProperty(QTextFormat::LayoutDirection));
-    QVERIFY(block.blockFormat().layoutDirection() == Qt::LeftToRight);
+    QCOMPARE(block.blockFormat().layoutDirection(), Qt::LeftToRight);
 }
 
 void tst_QTextDocumentFragment::html_metaInBody()
diff --git a/tests/auto/gui/text/qtextformat/tst_qtextformat.cpp b/tests/auto/gui/text/qtextformat/tst_qtextformat.cpp
index 7c742bc864..5a401031e2 100644
--- a/tests/auto/gui/text/qtextformat/tst_qtextformat.cpp
+++ b/tests/auto/gui/text/qtextformat/tst_qtextformat.cpp
@@ -101,7 +101,7 @@ void tst_QTextFormat::defaultAlignment()
     QTextBlockFormat fmt;
     QVERIFY(!fmt.hasProperty(QTextFormat::BlockAlignment));
     QCOMPARE(fmt.intProperty(QTextFormat::BlockAlignment), 0);
-    QVERIFY(fmt.alignment() == Qt::AlignLeft);
+    QCOMPARE(fmt.alignment(), Qt::AlignLeft);
 }
 
 void tst_QTextFormat::testUnderlinePropertyPrecedence()
@@ -209,7 +209,7 @@ void tst_QTextFormat::resolveFont()
     QVector<QTextFormat> formats = doc.allFormats();
     QCOMPARE(formats.count(), 3);
 
-    QVERIFY(formats.at(2).type() == QTextFormat::CharFormat);
+    QCOMPARE(formats.at(2).type(), int(QTextFormat::CharFormat));
     fmt = formats.at(2).toCharFormat();
 
     QVERIFY(!fmt.font().underline());
diff --git a/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp b/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp
index f7c871fc0f..b19f90935b 100644
--- a/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp
+++ b/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp
@@ -1722,7 +1722,7 @@ void tst_QTextLayout::capitalization_allUpperCase()
     QTextEngine *engine = layout.engine();
     engine->itemize();
     QCOMPARE(engine->layoutData->items.count(), 1);
-    QVERIFY(engine->layoutData->items.at(0).analysis.flags == QScriptAnalysis::Uppercase);
+    QCOMPARE(engine->layoutData->items.at(0).analysis.flags, ushort(QScriptAnalysis::Uppercase));
 }
 
 void tst_QTextLayout::capitalization_allUpperCase_newline()
@@ -1742,9 +1742,9 @@ void tst_QTextLayout::capitalization_allUpperCase_newline()
     QTextEngine *engine = layout.engine();
     engine->itemize();
     QCOMPARE(engine->layoutData->items.count(), 3);
-    QVERIFY(engine->layoutData->items.at(0).analysis.flags == QScriptAnalysis::Uppercase);
-    QVERIFY(engine->layoutData->items.at(1).analysis.flags == QScriptAnalysis::LineOrParagraphSeparator);
-    QVERIFY(engine->layoutData->items.at(2).analysis.flags == QScriptAnalysis::Uppercase);
+    QCOMPARE(engine->layoutData->items.at(0).analysis.flags, ushort(QScriptAnalysis::Uppercase));
+    QCOMPARE(engine->layoutData->items.at(1).analysis.flags, ushort(QScriptAnalysis::LineOrParagraphSeparator));
+    QCOMPARE(engine->layoutData->items.at(2).analysis.flags, ushort(QScriptAnalysis::Uppercase));
 }
 
 void tst_QTextLayout::capitalization_allLowerCase()
@@ -1760,7 +1760,7 @@ void tst_QTextLayout::capitalization_allLowerCase()
     QTextEngine *engine = layout.engine();
     engine->itemize();
     QCOMPARE(engine->layoutData->items.count(), 1);
-    QVERIFY(engine->layoutData->items.at(0).analysis.flags == QScriptAnalysis::Lowercase);
+    QCOMPARE(engine->layoutData->items.at(0).analysis.flags, ushort(QScriptAnalysis::Lowercase));
 }
 
 void tst_QTextLayout::capitalization_smallCaps()
@@ -1776,8 +1776,8 @@ void tst_QTextLayout::capitalization_smallCaps()
     QTextEngine *engine = layout.engine();
     engine->itemize();
     QCOMPARE(engine->layoutData->items.count(), 2);
-    QVERIFY(engine->layoutData->items.at(0).analysis.flags == QScriptAnalysis::None);
-    QVERIFY(engine->layoutData->items.at(1).analysis.flags == QScriptAnalysis::SmallCaps);
+    QCOMPARE(engine->layoutData->items.at(0).analysis.flags, ushort(QScriptAnalysis::None));
+    QCOMPARE(engine->layoutData->items.at(1).analysis.flags, ushort(QScriptAnalysis::SmallCaps));
 }
 
 void tst_QTextLayout::capitalization_capitalize()
@@ -1793,11 +1793,11 @@ void tst_QTextLayout::capitalization_capitalize()
     QTextEngine *engine = layout.engine();
     engine->itemize();
     QCOMPARE(engine->layoutData->items.count(), 5);
-    QVERIFY(engine->layoutData->items.at(0).analysis.flags == QScriptAnalysis::Uppercase);
-    QVERIFY(engine->layoutData->items.at(1).analysis.flags == QScriptAnalysis::None);
-    QVERIFY(engine->layoutData->items.at(2).analysis.flags == QScriptAnalysis::Tab);
-    QVERIFY(engine->layoutData->items.at(3).analysis.flags == QScriptAnalysis::Uppercase);
-    QVERIFY(engine->layoutData->items.at(4).analysis.flags == QScriptAnalysis::None);
+    QCOMPARE(engine->layoutData->items.at(0).analysis.flags, ushort(QScriptAnalysis::Uppercase));
+    QCOMPARE(engine->layoutData->items.at(1).analysis.flags, ushort(QScriptAnalysis::None));
+    QCOMPARE(engine->layoutData->items.at(2).analysis.flags, ushort(QScriptAnalysis::Tab));
+    QCOMPARE(engine->layoutData->items.at(3).analysis.flags, ushort(QScriptAnalysis::Uppercase));
+    QCOMPARE(engine->layoutData->items.at(4).analysis.flags, ushort(QScriptAnalysis::None));
 }
 
 void tst_QTextLayout::longText()
@@ -2073,8 +2073,8 @@ void tst_QTextLayout::cursorInNonStopChars()
     QTextLine line = layout.createLine();
     layout.endLayout();
 
-    QVERIFY(line.cursorToX(1) == line.cursorToX(3));
-    QVERIFY(line.cursorToX(2) == line.cursorToX(3));
+    QCOMPARE(line.cursorToX(1), line.cursorToX(3));
+    QCOMPARE(line.cursorToX(2), line.cursorToX(3));
 }
 
 void tst_QTextLayout::justifyTrailingSpaces()
diff --git a/tests/auto/gui/text/qtextlist/tst_qtextlist.cpp b/tests/auto/gui/text/qtextlist/tst_qtextlist.cpp
index c57123af61..03e557d8dd 100644
--- a/tests/auto/gui/text/qtextlist/tst_qtextlist.cpp
+++ b/tests/auto/gui/text/qtextlist/tst_qtextlist.cpp
@@ -113,11 +113,11 @@ void tst_QTextList::autoNumbering()
     for (int i = 0; i < 27; ++i)
         cursor.insertBlock();
 
-    QVERIFY(list->count() == 28);
+    QCOMPARE(list->count(), 28);
 
     QVERIFY(cursor.currentList());
-    QVERIFY(cursor.currentList()->itemNumber(cursor.block()) == 27);
-    QVERIFY(cursor.currentList()->itemText(cursor.block()) == "ab.");
+    QCOMPARE(cursor.currentList()->itemNumber(cursor.block()), 27);
+    QCOMPARE(cursor.currentList()->itemText(cursor.block()), QLatin1String("ab."));
 }
 
 void tst_QTextList::autoNumberingPrefixAndSuffix()
@@ -132,11 +132,11 @@ void tst_QTextList::autoNumberingPrefixAndSuffix()
     for (int i = 0; i < 27; ++i)
         cursor.insertBlock();
 
-    QVERIFY(list->count() == 28);
+    QCOMPARE(list->count(), 28);
 
     QVERIFY(cursor.currentList());
-    QVERIFY(cursor.currentList()->itemNumber(cursor.block()) == 27);
-    QVERIFY(cursor.currentList()->itemText(cursor.block()) == "-ab)");
+    QCOMPARE(cursor.currentList()->itemNumber(cursor.block()), 27);
+    QCOMPARE(cursor.currentList()->itemText(cursor.block()), QLatin1String("-ab)"));
 }
 
 void tst_QTextList::autoNumberingPrefixAndSuffixRTL()
@@ -154,9 +154,9 @@ void tst_QTextList::autoNumberingPrefixAndSuffixRTL()
 
     cursor.insertBlock();
 
-    QVERIFY(list->count() == 2);
+    QCOMPARE(list->count(), 2);
 
-    QVERIFY(cursor.currentList()->itemText(cursor.block()) == "*B-");
+    QCOMPARE(cursor.currentList()->itemText(cursor.block()), QLatin1String("*B-"));
 }
 
 void tst_QTextList::autoNumberingPrefixAndSuffixHtmlExportImport()
@@ -174,7 +174,7 @@ void tst_QTextList::autoNumberingPrefixAndSuffixHtmlExportImport()
     for (int i = 0; i < 27; ++i)
         cursor.insertBlock();
 
-    QVERIFY(list->count() == 28);
+    QCOMPARE(list->count(), 28);
 
     QString htmlExport = doc->toHtml();
     QTextDocument importDoc;
@@ -185,9 +185,9 @@ void tst_QTextList::autoNumberingPrefixAndSuffixHtmlExportImport()
         importCursor.movePosition(QTextCursor::NextBlock);
 
     QVERIFY(importCursor.currentList());
-    QVERIFY(importCursor.currentList()->itemNumber(importCursor.block()) == 27);
-    QVERIFY(importCursor.currentList()->itemText(importCursor.block()) == "\"ab#");
-    QVERIFY(importCursor.currentList()->format().indent() == 10);
+    QCOMPARE(importCursor.currentList()->itemNumber(importCursor.block()), 27);
+    QCOMPARE(importCursor.currentList()->itemText(importCursor.block()), QLatin1String("\"ab#"));
+    QCOMPARE(importCursor.currentList()->format().indent(), 10);
 }
 
 void tst_QTextList::autoNumberingRTL()
@@ -203,9 +203,9 @@ void tst_QTextList::autoNumberingRTL()
 
     cursor.insertBlock();
 
-    QVERIFY(list->count() == 2);
+    QCOMPARE(list->count(), 2);
 
-    QVERIFY(cursor.currentList()->itemText(cursor.block()) == ".B");
+    QCOMPARE(cursor.currentList()->itemText(cursor.block()), QLatin1String(".B"));
 }
 
 void tst_QTextList::romanNumbering()
@@ -218,11 +218,11 @@ void tst_QTextList::romanNumbering()
     for (int i = 0; i < 4998; ++i)
       cursor.insertBlock();
 
-    QVERIFY(list->count() == 4999);
+    QCOMPARE(list->count(), 4999);
 
     QVERIFY(cursor.currentList());
-    QVERIFY(cursor.currentList()->itemNumber(cursor.block()) == 4998);
-    QVERIFY(cursor.currentList()->itemText(cursor.block()) == "MMMMCMXCIX.");
+    QCOMPARE(cursor.currentList()->itemNumber(cursor.block()), 4998);
+    QCOMPARE(cursor.currentList()->itemText(cursor.block()), QLatin1String("MMMMCMXCIX."));
 }
 
 void tst_QTextList::romanNumberingLimit()
@@ -235,11 +235,11 @@ void tst_QTextList::romanNumberingLimit()
     for (int i = 0; i < 4999; ++i)
       cursor.insertBlock();
 
-    QVERIFY(list->count() == 5000);
+    QCOMPARE(list->count(), 5000);
 
     QVERIFY(cursor.currentList());
-    QVERIFY(cursor.currentList()->itemNumber(cursor.block()) == 4999);
-    QVERIFY(cursor.currentList()->itemText(cursor.block()) == "?.");
+    QCOMPARE(cursor.currentList()->itemNumber(cursor.block()), 4999);
+    QCOMPARE(cursor.currentList()->itemText(cursor.block()), QLatin1String("?."));
 }
 
 void tst_QTextList::formatChange()
@@ -257,12 +257,12 @@ void tst_QTextList::formatChange()
     QVERIFY(list && list->count() == 2);
 
     QTextBlockFormat bfmt = cursor.blockFormat();
-//     QVERIFY(bfmt.object() == list);
+//     QCOMPARE(bfmt.object(), list);
 
     bfmt.setObjectIndex(-1);
     cursor.setBlockFormat(bfmt);
 
-    QVERIFY(firstList->count() == 1);
+    QCOMPARE(firstList->count(), 1);
 }
 
 void tst_QTextList::cursorNavigation()
@@ -282,7 +282,7 @@ void tst_QTextList::cursorNavigation()
     QVERIFY(cursor.currentList());
     cursor.movePosition(QTextCursor::PreviousBlock);
     QVERIFY(cursor.currentList());
-    QVERIFY(cursor.currentList()->itemNumber(cursor.block()) == 0);
+    QCOMPARE(cursor.currentList()->itemNumber(cursor.block()), 0);
 }
 
 void tst_QTextList::partialRemoval()
diff --git a/tests/auto/gui/text/qtextpiecetable/tst_qtextpiecetable.cpp b/tests/auto/gui/text/qtextpiecetable/tst_qtextpiecetable.cpp
index ae8948a61f..cd43849729 100644
--- a/tests/auto/gui/text/qtextpiecetable/tst_qtextpiecetable.cpp
+++ b/tests/auto/gui/text/qtextpiecetable/tst_qtextpiecetable.cpp
@@ -157,7 +157,7 @@ void tst_QTextPieceTable::insertion3()
         table->insert(pos, str, charFormatIndex);
         compare.insert(pos, str);
     }
-    QVERIFY(table->plainText() == compare);
+    QCOMPARE(table->plainText(), compare);
 }
 
 void tst_QTextPieceTable::insertion4()
@@ -176,7 +176,7 @@ void tst_QTextPieceTable::insertion4()
 //            exit(12);
 //        }
     }
-    QVERIFY(table->plainText() == compare);
+    QCOMPARE(table->plainText(), compare);
 }
 
 void tst_QTextPieceTable::insertion5()
@@ -196,10 +196,10 @@ void tst_QTextPieceTable::insertion5()
         }
         compare.insert(pos, str);
     }
-    QVERIFY(table->plainText() == compare);
+    QCOMPARE(table->plainText(), compare);
     for (QTextBlock it = table->blocksBegin(); it != table->blocksEnd(); it = it.next()) {
         QTextDocumentPrivate::FragmentIterator fit = table->find(it.position());
-        QVERIFY(fit.position() == it.position());
+        QCOMPARE(fit.position(), it.position());
     }
 }
 
@@ -260,7 +260,7 @@ void tst_QTextPieceTable::removal3()
 //            exit(12);
 //        }
     }
-    QVERIFY(table->plainText() == compare);
+    QCOMPARE(table->plainText(), compare);
 }
 
 void tst_QTextPieceTable::removal4()
@@ -294,7 +294,7 @@ void tst_QTextPieceTable::removal4()
 //            exit(12);
 //        }
     }
-    QVERIFY(table->plainText() == compare);
+    QCOMPARE(table->plainText(), compare);
 }
 
 void tst_QTextPieceTable::undoRedo1()
@@ -392,7 +392,7 @@ void tst_QTextPieceTable::undoRedo6()
     QTextBlockFormat bfmt;
     bfmt.setAlignment(Qt::AlignHCenter);
     cursor.setBlockFormat(bfmt);
-    QVERIFY(cursor.blockFormat().alignment() == Qt::AlignHCenter);
+    QCOMPARE(cursor.blockFormat().alignment(), Qt::AlignHCenter);
 
     QTextCursor range = cursor;
     range.clearSelection();
@@ -404,11 +404,11 @@ void tst_QTextPieceTable::undoRedo6()
     range.mergeCharFormat(modifier);
 
     cursor.movePosition(QTextCursor::Start);
-    QVERIFY(cursor.blockFormat().alignment() == Qt::AlignHCenter);
+    QCOMPARE(cursor.blockFormat().alignment(), Qt::AlignHCenter);
 
     doc.undo();
 
-    QVERIFY(cursor.blockFormat().alignment() == Qt::AlignHCenter);
+    QCOMPARE(cursor.blockFormat().alignment(), Qt::AlignHCenter);
 }
 
 void tst_QTextPieceTable::undoRedo7()
@@ -497,13 +497,13 @@ void tst_QTextPieceTable::undoRedo11()
         }
         l += remove ? -1 : 2;
     }
-    QVERIFY(table->plainText() == compare);
+    QCOMPARE(table->plainText(), compare);
     for (int i = 0; i < loops; ++i)
         table->undo();
-    QVERIFY(table->plainText() == QString(""));
+    QCOMPARE(table->plainText(), QString(""));
     for (int i = 0; i < loops; ++i)
         table->redo();
-    QVERIFY(table->plainText() == compare);
+    QCOMPARE(table->plainText(), compare);
 }
 
 
@@ -693,9 +693,9 @@ void tst_QTextPieceTable::setBlockFormat()
     QTextBlock b = table->blocksFind(1);
     table->setBlockFormat(b, b, newbfmt);
 
-    QVERIFY(table->blocksFind(0).blockFormat() == bfmt);
-    QVERIFY(table->blocksFind(1).blockFormat() == newbfmt);
-    QVERIFY(table->blocksFind(2).blockFormat() == bfmt);
+    QCOMPARE(table->blocksFind(0).blockFormat(), bfmt);
+    QCOMPARE(table->blocksFind(1).blockFormat(), newbfmt);
+    QCOMPARE(table->blocksFind(2).blockFormat(), bfmt);
 }
 
 
@@ -705,19 +705,19 @@ void tst_QTextPieceTable::blockInsertion()
     fmt.setTopMargin(100);
     int idx = table->formatCollection()->indexForFormat(fmt);
     int charFormat = table->formatCollection()->indexForFormat(QTextCharFormat());
-    QVERIFY(table->blocksFind(0).blockFormat() == QTextBlockFormat());
+    QCOMPARE(table->blocksFind(0).blockFormat(), QTextBlockFormat());
 
     table->insertBlock(0, idx, charFormat);
-    QVERIFY(table->blocksFind(0).blockFormat() == QTextBlockFormat());
-    QVERIFY(table->blocksFind(1).blockFormat() == fmt);
+    QCOMPARE(table->blocksFind(0).blockFormat(), QTextBlockFormat());
+    QCOMPARE(table->blocksFind(1).blockFormat(), fmt);
 
     table->undo();
-    QVERIFY(table->blockMap().length() == 1);
-    QVERIFY(table->blocksFind(0).blockFormat() == QTextBlockFormat());
+    QCOMPARE(table->blockMap().length(), 1);
+    QCOMPARE(table->blocksFind(0).blockFormat(), QTextBlockFormat());
 
     table->redo();
-    QVERIFY(table->blocksFind(0).blockFormat() == QTextBlockFormat());
-    QVERIFY(table->blocksFind(1).blockFormat() == fmt);
+    QCOMPARE(table->blocksFind(0).blockFormat(), QTextBlockFormat());
+    QCOMPARE(table->blocksFind(1).blockFormat(), fmt);
 }
 
 void tst_QTextPieceTable::blockInsertion2()
@@ -755,37 +755,37 @@ void tst_QTextPieceTable::blockRemoval1()
     table->insertBlock(9, idx2, charFormatIndex);
     table->insert(10, "0123", charFormatIndex);
 
-    QVERIFY(table->blocksFind(0).blockFormat() == QTextBlockFormat());
-    QVERIFY(table->blocksFind(4).blockFormat() == QTextBlockFormat());
-    QVERIFY(table->blocksFind(5).blockFormat() == fmt1);
-    QVERIFY(table->blocksFind(10).blockFormat() == fmt2);
-    QVERIFY(table->blocksFind(1).position() == 0);
-    QVERIFY(table->blocksFind(6).position() == 5);
-    QVERIFY(table->blocksFind(11).position() == 10);
+    QCOMPARE(table->blocksFind(0).blockFormat(), QTextBlockFormat());
+    QCOMPARE(table->blocksFind(4).blockFormat(), QTextBlockFormat());
+    QCOMPARE(table->blocksFind(5).blockFormat(), fmt1);
+    QCOMPARE(table->blocksFind(10).blockFormat(), fmt2);
+    QCOMPARE(table->blocksFind(1).position(), 0);
+    QCOMPARE(table->blocksFind(6).position(), 5);
+    QCOMPARE(table->blocksFind(11).position(), 10);
 
     table->beginEditBlock();
     table->remove(5, 5);
     table->endEditBlock();
-    QVERIFY(table->blocksFind(4).blockFormat() == QTextBlockFormat());
-    QVERIFY(table->blocksFind(5).blockFormat() == fmt2);
-    QVERIFY(table->blocksFind(4).position() == 0);
-    QVERIFY(table->blocksFind(5).position() == 5);
+    QCOMPARE(table->blocksFind(4).blockFormat(), QTextBlockFormat());
+    QCOMPARE(table->blocksFind(5).blockFormat(), fmt2);
+    QCOMPARE(table->blocksFind(4).position(), 0);
+    QCOMPARE(table->blocksFind(5).position(), 5);
 
     table->undo();
 
-    QVERIFY(table->blocksFind(0).blockFormat() == QTextBlockFormat());
-    QVERIFY(table->blocksFind(4).blockFormat() == QTextBlockFormat());
-    QVERIFY(table->blocksFind(5).blockFormat() == fmt1);
-    QVERIFY(table->blocksFind(10).blockFormat() == fmt2);
-    QVERIFY(table->blocksFind(1).position() == 0);
-    QVERIFY(table->blocksFind(6).position() == 5);
-    QVERIFY(table->blocksFind(11).position() == 10);
+    QCOMPARE(table->blocksFind(0).blockFormat(), QTextBlockFormat());
+    QCOMPARE(table->blocksFind(4).blockFormat(), QTextBlockFormat());
+    QCOMPARE(table->blocksFind(5).blockFormat(), fmt1);
+    QCOMPARE(table->blocksFind(10).blockFormat(), fmt2);
+    QCOMPARE(table->blocksFind(1).position(), 0);
+    QCOMPARE(table->blocksFind(6).position(), 5);
+    QCOMPARE(table->blocksFind(11).position(), 10);
 
     table->redo();
-    QVERIFY(table->blocksFind(4).blockFormat() == QTextBlockFormat());
-    QVERIFY(table->blocksFind(5).blockFormat() == fmt2);
-    QVERIFY(table->blocksFind(4).position() == 0);
-    QVERIFY(table->blocksFind(5).position() == 5);
+    QCOMPARE(table->blocksFind(4).blockFormat(), QTextBlockFormat());
+    QCOMPARE(table->blocksFind(5).blockFormat(), fmt2);
+    QCOMPARE(table->blocksFind(4).position(), 0);
+    QCOMPARE(table->blocksFind(5).position(), 5);
 }
 
 void tst_QTextPieceTable::blockRemoval2()
@@ -803,35 +803,35 @@ void tst_QTextPieceTable::blockRemoval2()
     table->insertBlock(9, idx2, charFormatIndex);
     table->insert(10, "0123", charFormatIndex);
 
-    QVERIFY(table->blocksFind(0).blockFormat() == QTextBlockFormat());
-    QVERIFY(table->blocksFind(4).blockFormat() == QTextBlockFormat());
-    QVERIFY(table->blocksFind(5).blockFormat() == fmt1);
-    QVERIFY(table->blocksFind(10).blockFormat() == fmt2);
-    QVERIFY(table->blocksFind(1).position() == 0);
-    QVERIFY(table->blocksFind(6).position() == 5);
-    QVERIFY(table->blocksFind(11).position() == 10);
+    QCOMPARE(table->blocksFind(0).blockFormat(), QTextBlockFormat());
+    QCOMPARE(table->blocksFind(4).blockFormat(), QTextBlockFormat());
+    QCOMPARE(table->blocksFind(5).blockFormat(), fmt1);
+    QCOMPARE(table->blocksFind(10).blockFormat(), fmt2);
+    QCOMPARE(table->blocksFind(1).position(), 0);
+    QCOMPARE(table->blocksFind(6).position(), 5);
+    QCOMPARE(table->blocksFind(11).position(), 10);
 
     table->remove(4, 1);
-    QVERIFY(table->blocksFind(4).blockFormat() == QTextBlockFormat());
-    QVERIFY(table->blocksFind(6).blockFormat() == QTextBlockFormat());
-    QVERIFY(table->blocksFind(4).position() == 0);
-    QVERIFY(table->blocksFind(6).position() == 0);
+    QCOMPARE(table->blocksFind(4).blockFormat(), QTextBlockFormat());
+    QCOMPARE(table->blocksFind(6).blockFormat(), QTextBlockFormat());
+    QCOMPARE(table->blocksFind(4).position(), 0);
+    QCOMPARE(table->blocksFind(6).position(), 0);
 
     table->undo();
 
-    QVERIFY(table->blocksFind(0).blockFormat() == QTextBlockFormat());
-    QVERIFY(table->blocksFind(4).blockFormat() == QTextBlockFormat());
-    QVERIFY(table->blocksFind(5).blockFormat() == fmt1);
-    QVERIFY(table->blocksFind(10).blockFormat() == fmt2);
-    QVERIFY(table->blocksFind(1).position() == 0);
-    QVERIFY(table->blocksFind(6).position() == 5);
-    QVERIFY(table->blocksFind(11).position() == 10);
+    QCOMPARE(table->blocksFind(0).blockFormat(), QTextBlockFormat());
+    QCOMPARE(table->blocksFind(4).blockFormat(), QTextBlockFormat());
+    QCOMPARE(table->blocksFind(5).blockFormat(), fmt1);
+    QCOMPARE(table->blocksFind(10).blockFormat(), fmt2);
+    QCOMPARE(table->blocksFind(1).position(), 0);
+    QCOMPARE(table->blocksFind(6).position(), 5);
+    QCOMPARE(table->blocksFind(11).position(), 10);
 
     table->redo();
-    QVERIFY(table->blocksFind(4).blockFormat() == QTextBlockFormat());
-    QVERIFY(table->blocksFind(6).blockFormat() == QTextBlockFormat());
-    QVERIFY(table->blocksFind(4).position() == 0);
-    QVERIFY(table->blocksFind(6).position() == 0);
+    QCOMPARE(table->blocksFind(4).blockFormat(), QTextBlockFormat());
+    QCOMPARE(table->blocksFind(6).blockFormat(), QTextBlockFormat());
+    QCOMPARE(table->blocksFind(4).position(), 0);
+    QCOMPARE(table->blocksFind(6).position(), 0);
 }
 
 void tst_QTextPieceTable::blockRemoval3()
@@ -849,38 +849,38 @@ void tst_QTextPieceTable::blockRemoval3()
     table->insertBlock(9, idx2, charFormatIndex);
     table->insert(10, "0123", charFormatIndex);
 
-    QVERIFY(table->blocksFind(0).blockFormat() == QTextBlockFormat());
-    QVERIFY(table->blocksFind(4).blockFormat() == QTextBlockFormat());
-    QVERIFY(table->blocksFind(5).blockFormat() == fmt1);
-    QVERIFY(table->blocksFind(10).blockFormat() == fmt2);
-    QVERIFY(table->blocksFind(1).position() == 0);
-    QVERIFY(table->blocksFind(6).position() == 5);
-    QVERIFY(table->blocksFind(11).position() == 10);
+    QCOMPARE(table->blocksFind(0).blockFormat(), QTextBlockFormat());
+    QCOMPARE(table->blocksFind(4).blockFormat(), QTextBlockFormat());
+    QCOMPARE(table->blocksFind(5).blockFormat(), fmt1);
+    QCOMPARE(table->blocksFind(10).blockFormat(), fmt2);
+    QCOMPARE(table->blocksFind(1).position(), 0);
+    QCOMPARE(table->blocksFind(6).position(), 5);
+    QCOMPARE(table->blocksFind(11).position(), 10);
 
     table->beginEditBlock();
     table->remove(3, 4);
     table->endEditBlock();
 
-    QVERIFY(table->blocksFind(1).blockFormat() == QTextBlockFormat());
-    QVERIFY(table->blocksFind(5).blockFormat() == QTextBlockFormat());
-    QVERIFY(table->blocksFind(1).position() == 0);
-    QVERIFY(table->blocksFind(5).position() == 0);
+    QCOMPARE(table->blocksFind(1).blockFormat(), QTextBlockFormat());
+    QCOMPARE(table->blocksFind(5).blockFormat(), QTextBlockFormat());
+    QCOMPARE(table->blocksFind(1).position(), 0);
+    QCOMPARE(table->blocksFind(5).position(), 0);
 
     table->undo();
 
-    QVERIFY(table->blocksFind(0).blockFormat() == QTextBlockFormat());
-    QVERIFY(table->blocksFind(4).blockFormat() == QTextBlockFormat());
-    QVERIFY(table->blocksFind(5).blockFormat() == fmt1);
-    QVERIFY(table->blocksFind(10).blockFormat() == fmt2);
-    QVERIFY(table->blocksFind(1).position() == 0);
-    QVERIFY(table->blocksFind(6).position() == 5);
-    QVERIFY(table->blocksFind(11).position() == 10);
+    QCOMPARE(table->blocksFind(0).blockFormat(), QTextBlockFormat());
+    QCOMPARE(table->blocksFind(4).blockFormat(), QTextBlockFormat());
+    QCOMPARE(table->blocksFind(5).blockFormat(), fmt1);
+    QCOMPARE(table->blocksFind(10).blockFormat(), fmt2);
+    QCOMPARE(table->blocksFind(1).position(), 0);
+    QCOMPARE(table->blocksFind(6).position(), 5);
+    QCOMPARE(table->blocksFind(11).position(), 10);
 
     table->redo();
-    QVERIFY(table->blocksFind(1).blockFormat() == QTextBlockFormat());
-    QVERIFY(table->blocksFind(5).blockFormat() == QTextBlockFormat());
-    QVERIFY(table->blocksFind(1).position() == 0);
-    QVERIFY(table->blocksFind(5).position() == 0);
+    QCOMPARE(table->blocksFind(1).blockFormat(), QTextBlockFormat());
+    QCOMPARE(table->blocksFind(5).blockFormat(), QTextBlockFormat());
+    QCOMPARE(table->blocksFind(1).position(), 0);
+    QCOMPARE(table->blocksFind(5).position(), 0);
 }
 
 void tst_QTextPieceTable::blockRemoval4()
@@ -899,35 +899,35 @@ void tst_QTextPieceTable::blockRemoval4()
     table->insertBlock(9, idx2, charFormatIndex);
     table->insert(10, "0123", charFormatIndex);
 
-    QVERIFY(table->blocksFind(0).blockFormat() == QTextBlockFormat());
-    QVERIFY(table->blocksFind(4).blockFormat() == QTextBlockFormat());
-    QVERIFY(table->blocksFind(5).blockFormat() == fmt1);
-    QVERIFY(table->blocksFind(10).blockFormat() == fmt2);
-    QVERIFY(table->blocksFind(1).position() == 0);
-    QVERIFY(table->blocksFind(6).position() == 5);
-    QVERIFY(table->blocksFind(11).position() == 10);
+    QCOMPARE(table->blocksFind(0).blockFormat(), QTextBlockFormat());
+    QCOMPARE(table->blocksFind(4).blockFormat(), QTextBlockFormat());
+    QCOMPARE(table->blocksFind(5).blockFormat(), fmt1);
+    QCOMPARE(table->blocksFind(10).blockFormat(), fmt2);
+    QCOMPARE(table->blocksFind(1).position(), 0);
+    QCOMPARE(table->blocksFind(6).position(), 5);
+    QCOMPARE(table->blocksFind(11).position(), 10);
 
     table->remove(3, 7);
-    QVERIFY(table->blocksFind(1).position() == 0);
-    QVERIFY(table->blocksFind(5).position() == 0);
-    QVERIFY(table->blocksFind(1).blockFormat() == QTextBlockFormat());
-    QVERIFY(table->blocksFind(5).blockFormat() == QTextBlockFormat());
+    QCOMPARE(table->blocksFind(1).position(), 0);
+    QCOMPARE(table->blocksFind(5).position(), 0);
+    QCOMPARE(table->blocksFind(1).blockFormat(), QTextBlockFormat());
+    QCOMPARE(table->blocksFind(5).blockFormat(), QTextBlockFormat());
 
     table->undo();
 
-    QVERIFY(table->blocksFind(0).blockFormat() == QTextBlockFormat());
-    QVERIFY(table->blocksFind(4).blockFormat() == QTextBlockFormat());
-    QVERIFY(table->blocksFind(5).blockFormat() == fmt1);
-    QVERIFY(table->blocksFind(10).blockFormat() == fmt2);
-    QVERIFY(table->blocksFind(1).position() == 0);
-    QVERIFY(table->blocksFind(6).position() == 5);
-    QVERIFY(table->blocksFind(11).position() == 10);
+    QCOMPARE(table->blocksFind(0).blockFormat(), QTextBlockFormat());
+    QCOMPARE(table->blocksFind(4).blockFormat(), QTextBlockFormat());
+    QCOMPARE(table->blocksFind(5).blockFormat(), fmt1);
+    QCOMPARE(table->blocksFind(10).blockFormat(), fmt2);
+    QCOMPARE(table->blocksFind(1).position(), 0);
+    QCOMPARE(table->blocksFind(6).position(), 5);
+    QCOMPARE(table->blocksFind(11).position(), 10);
 
     table->redo();
-    QVERIFY(table->blocksFind(1).position() == 0);
-    QVERIFY(table->blocksFind(5).position() == 0);
-    QVERIFY(table->blocksFind(1).blockFormat() == QTextBlockFormat());
-    QVERIFY(table->blocksFind(5).blockFormat() == QTextBlockFormat());
+    QCOMPARE(table->blocksFind(1).position(), 0);
+    QCOMPARE(table->blocksFind(5).position(), 0);
+    QCOMPARE(table->blocksFind(1).blockFormat(), QTextBlockFormat());
+    QCOMPARE(table->blocksFind(5).blockFormat(), QTextBlockFormat());
 #endif
 }
 
@@ -946,38 +946,38 @@ void tst_QTextPieceTable::blockRemoval5()
     table->insertBlock(9, idx2, charFormatIndex);
     table->insert(10, "0123", charFormatIndex);
 
-    QVERIFY(table->blocksFind(0).blockFormat() == QTextBlockFormat());
-    QVERIFY(table->blocksFind(4).blockFormat() == QTextBlockFormat());
-    QVERIFY(table->blocksFind(5).blockFormat() == fmt1);
-    QVERIFY(table->blocksFind(10).blockFormat() == fmt2);
-    QVERIFY(table->blocksFind(1).position() == 0);
-    QVERIFY(table->blocksFind(6).position() == 5);
-    QVERIFY(table->blocksFind(11).position() == 10);
+    QCOMPARE(table->blocksFind(0).blockFormat(), QTextBlockFormat());
+    QCOMPARE(table->blocksFind(4).blockFormat(), QTextBlockFormat());
+    QCOMPARE(table->blocksFind(5).blockFormat(), fmt1);
+    QCOMPARE(table->blocksFind(10).blockFormat(), fmt2);
+    QCOMPARE(table->blocksFind(1).position(), 0);
+    QCOMPARE(table->blocksFind(6).position(), 5);
+    QCOMPARE(table->blocksFind(11).position(), 10);
 
     table->beginEditBlock();
     table->remove(3, 8);
     table->endEditBlock();
 
-    QVERIFY(table->blocksFind(0).blockFormat() == QTextBlockFormat());
-    QVERIFY(table->blocksFind(5).blockFormat() == QTextBlockFormat());
-    QVERIFY(table->blocksFind(1).position() == 0);
-    QVERIFY(table->blocksFind(5).position() == 0);
+    QCOMPARE(table->blocksFind(0).blockFormat(), QTextBlockFormat());
+    QCOMPARE(table->blocksFind(5).blockFormat(), QTextBlockFormat());
+    QCOMPARE(table->blocksFind(1).position(), 0);
+    QCOMPARE(table->blocksFind(5).position(), 0);
 
     table->undo();
 
-    QVERIFY(table->blocksFind(0).blockFormat() == QTextBlockFormat());
-    QVERIFY(table->blocksFind(4).blockFormat() == QTextBlockFormat());
-    QVERIFY(table->blocksFind(5).blockFormat() == fmt1);
-    QVERIFY(table->blocksFind(10).blockFormat() == fmt2);
-    QVERIFY(table->blocksFind(1).position() == 0);
-    QVERIFY(table->blocksFind(6).position() == 5);
-    QVERIFY(table->blocksFind(11).position() == 10);
+    QCOMPARE(table->blocksFind(0).blockFormat(), QTextBlockFormat());
+    QCOMPARE(table->blocksFind(4).blockFormat(), QTextBlockFormat());
+    QCOMPARE(table->blocksFind(5).blockFormat(), fmt1);
+    QCOMPARE(table->blocksFind(10).blockFormat(), fmt2);
+    QCOMPARE(table->blocksFind(1).position(), 0);
+    QCOMPARE(table->blocksFind(6).position(), 5);
+    QCOMPARE(table->blocksFind(11).position(), 10);
 
     table->redo();
-    QVERIFY(table->blocksFind(0).blockFormat() == QTextBlockFormat());
-    QVERIFY(table->blocksFind(5).blockFormat() == QTextBlockFormat());
-    QVERIFY(table->blocksFind(1).position() == 0);
-    QVERIFY(table->blocksFind(5).position() == 0);
+    QCOMPARE(table->blocksFind(0).blockFormat(), QTextBlockFormat());
+    QCOMPARE(table->blocksFind(5).blockFormat(), QTextBlockFormat());
+    QCOMPARE(table->blocksFind(1).position(), 0);
+    QCOMPARE(table->blocksFind(5).position(), 0);
 }
 
 
@@ -996,66 +996,66 @@ void tst_QTextPieceTable::checkFrames1()
     QPointer<QTextFrame> frame = table->insertFrame(1, 3, ffmt);
     QTextFrame *root = table->rootFrame();
 
-    QVERIFY(root == frame->parentFrame());
+    QCOMPARE(root, frame->parentFrame());
 
     QVERIFY(root);
-    QVERIFY(root->parentFrame() == 0);
+    QVERIFY(!root->parentFrame());
 
-    QVERIFY(root->childFrames().count() == 1);
+    QCOMPARE(root->childFrames().count(), 1);
     QVERIFY(frame->format() == ffmt);
-    QVERIFY(frame->firstPosition() == 2);
-    QVERIFY(frame->lastPosition() == 4);
+    QCOMPARE(frame->firstPosition(), 2);
+    QCOMPARE(frame->lastPosition(), 4);
 
 
     QPointer<QTextFrame> frame2 = table->insertFrame(2, 3, ffmt);
 
-    QVERIFY(root->childFrames().count() == 1);
-    QVERIFY(root->childFrames().at(0) == frame);
-    QVERIFY(frame->childFrames().count() == 1);
-    QVERIFY(frame2->childFrames().count() == 0);
-    QVERIFY(frame2->parentFrame() == frame);
-    QVERIFY(frame2->firstPosition() == 3);
-    QVERIFY(frame2->lastPosition() == 4);
+    QCOMPARE(root->childFrames().count(), 1);
+    QCOMPARE(root->childFrames().at(0), frame.data());
+    QCOMPARE(frame->childFrames().count(), 1);
+    QCOMPARE(frame2->childFrames().count(), 0);
+    QCOMPARE(frame2->parentFrame(), frame.data());
+    QCOMPARE(frame2->firstPosition(), 3);
+    QCOMPARE(frame2->lastPosition(), 4);
 
     QVERIFY(frame->format() == ffmt);
-    QVERIFY(frame->firstPosition() == 2);
-    QVERIFY(frame->lastPosition() == 6);
+    QCOMPARE(frame->firstPosition(), 2);
+    QCOMPARE(frame->lastPosition(), 6);
 
     table->removeFrame(frame);
 
-    QVERIFY(root->childFrames().count() == 1);
-    QVERIFY(root->childFrames().at(0) == frame2);
+    QCOMPARE(root->childFrames().count(), 1);
+    QCOMPARE(root->childFrames().at(0), frame2.data());
     QVERIFY(!frame);
-    QVERIFY(frame2->childFrames().count() == 0);
-    QVERIFY(frame2->parentFrame() == root);
-    QVERIFY(frame2->firstPosition() == 2);
-    QVERIFY(frame2->lastPosition() == 3);
+    QCOMPARE(frame2->childFrames().count(), 0);
+    QCOMPARE(frame2->parentFrame(), root);
+    QCOMPARE(frame2->firstPosition(), 2);
+    QCOMPARE(frame2->lastPosition(), 3);
 
     table->undo();
 
     frame = table->frameAt(2);
 
-    QVERIFY(root->childFrames().count() == 1);
-    QVERIFY(root->childFrames().at(0) == frame);
-    QVERIFY(frame->childFrames().count() == 1);
-    QVERIFY(frame->childFrames().at(0) == frame2);
-    QVERIFY(frame2->childFrames().count() == 0);
-    QVERIFY(frame2->parentFrame() == frame);
-    QVERIFY(frame2->firstPosition() == 3);
-    QVERIFY(frame2->lastPosition() == 4);
+    QCOMPARE(root->childFrames().count(), 1);
+    QCOMPARE(root->childFrames().at(0), frame.data());
+    QCOMPARE(frame->childFrames().count(), 1);
+    QCOMPARE(frame->childFrames().at(0), frame2.data());
+    QCOMPARE(frame2->childFrames().count(), 0);
+    QCOMPARE(frame2->parentFrame(), frame.data());
+    QCOMPARE(frame2->firstPosition(), 3);
+    QCOMPARE(frame2->lastPosition(), 4);
 
-    QVERIFY(frame->firstPosition() == 2);
-    QVERIFY(frame->lastPosition() == 6);
+    QCOMPARE(frame->firstPosition(), 2);
+    QCOMPARE(frame->lastPosition(), 6);
 
     table->undo();
 
-    QVERIFY(root->childFrames().count() == 1);
-    QVERIFY(root->childFrames().at(0) == frame);
-    QVERIFY(frame->childFrames().count() == 0);
+    QCOMPARE(root->childFrames().count(), 1);
+    QCOMPARE(root->childFrames().at(0), frame.data());
+    QCOMPARE(frame->childFrames().count(), 0);
     QVERIFY(!frame2);
 
-    QVERIFY(frame->firstPosition() == 2);
-    QVERIFY(frame->lastPosition() == 4);
+    QCOMPARE(frame->firstPosition(), 2);
+    QCOMPARE(frame->lastPosition(), 4);
 }
 
 void tst_QTextPieceTable::removeFrameDirect()
@@ -1065,7 +1065,7 @@ void tst_QTextPieceTable::removeFrameDirect()
 
     QTextFrame *frame = table->insertFrame(1, 5, ffmt);
 
-    QVERIFY(frame->parentFrame() == table->rootFrame());
+    QCOMPARE(frame->parentFrame(), table->rootFrame());
 
     const int start = frame->firstPosition() - 1;
     const int end = frame->lastPosition();
diff --git a/tests/auto/gui/text/qtexttable/tst_qtexttable.cpp b/tests/auto/gui/text/qtexttable/tst_qtexttable.cpp
index d7ff4e6c1e..1c099acc56 100644
--- a/tests/auto/gui/text/qtexttable/tst_qtexttable.cpp
+++ b/tests/auto/gui/text/qtexttable/tst_qtexttable.cpp
@@ -146,87 +146,87 @@ void tst_QTextTable::variousTableModifications()
     QTextTableFormat tableFmt;
 
     QTextTable *tab = cursor.insertTable(2, 2, tableFmt);
-    QVERIFY(doc->toPlainText().length() == 5);
-    QVERIFY(tab == cursor.currentTable());
-    QVERIFY(tab->columns() == 2);
-    QVERIFY(tab->rows() == 2);
+    QCOMPARE(doc->toPlainText().length(), 5);
+    QCOMPARE(tab, cursor.currentTable());
+    QCOMPARE(tab->columns(), 2);
+    QCOMPARE(tab->rows(), 2);
 
-    QVERIFY(cursor.position() == 1);
+    QCOMPARE(cursor.position(), 1);
     QTextCharFormat fmt = cursor.charFormat();
-    QVERIFY(fmt.objectIndex() == -1);
+    QCOMPARE(fmt.objectIndex(), -1);
     QTextTableCell cell = tab->cellAt(cursor);
     QVERIFY(cell.isValid());
-    QVERIFY(cell.row() == 0);
-    QVERIFY(cell.column() == 0);
+    QCOMPARE(cell.row(), 0);
+    QCOMPARE(cell.column(), 0);
 
     cursor.movePosition(QTextCursor::NextBlock);
-    QVERIFY(cursor.position() == 2);
+    QCOMPARE(cursor.position(), 2);
     fmt = cursor.charFormat();
-    QVERIFY(fmt.objectIndex() == -1);
+    QCOMPARE(fmt.objectIndex(), -1);
     cell = tab->cellAt(cursor);
     QVERIFY(cell.isValid());
-    QVERIFY(cell.row() == 0);
-    QVERIFY(cell.column() == 1);
+    QCOMPARE(cell.row(), 0);
+    QCOMPARE(cell.column(), 1);
 
     cursor.movePosition(QTextCursor::NextBlock);
-    QVERIFY(cursor.position() == 3);
+    QCOMPARE(cursor.position(), 3);
     fmt = cursor.charFormat();
-    QVERIFY(fmt.objectIndex() == -1);
+    QCOMPARE(fmt.objectIndex(), -1);
     cell = tab->cellAt(cursor);
     QVERIFY(cell.isValid());
-    QVERIFY(cell.row() == 1);
-    QVERIFY(cell.column() == 0);
+    QCOMPARE(cell.row(), 1);
+    QCOMPARE(cell.column(), 0);
 
     cursor.movePosition(QTextCursor::NextBlock);
-    QVERIFY(cursor.position() == 4);
+    QCOMPARE(cursor.position(), 4);
     fmt = cursor.charFormat();
-    QVERIFY(fmt.objectIndex() == -1);
+    QCOMPARE(fmt.objectIndex(), -1);
     cell = tab->cellAt(cursor);
     QVERIFY(cell.isValid());
-    QVERIFY(cell.row() == 1);
-    QVERIFY(cell.column() == 1);
+    QCOMPARE(cell.row(), 1);
+    QCOMPARE(cell.column(), 1);
 
     cursor.movePosition(QTextCursor::NextBlock);
-    QVERIFY(cursor.position() == 5);
+    QCOMPARE(cursor.position(), 5);
     fmt = cursor.charFormat();
-    QVERIFY(fmt.objectIndex() == -1);
+    QCOMPARE(fmt.objectIndex(), -1);
     cell = tab->cellAt(cursor);
     QVERIFY(!cell.isValid());
 
     cursor.movePosition(QTextCursor::NextBlock);
-    QVERIFY(cursor.position() == 5);
+    QCOMPARE(cursor.position(), 5);
 
     // check we can't delete the cells with the cursor
     cursor.movePosition(QTextCursor::Start);
     cursor.movePosition(QTextCursor::NextBlock);
-    QVERIFY(cursor.position() == 1);
+    QCOMPARE(cursor.position(), 1);
     cursor.deleteChar();
-    QVERIFY(doc->toPlainText().length() == 5);
+    QCOMPARE(doc->toPlainText().length(), 5);
     cursor.movePosition(QTextCursor::NextBlock);
-    QVERIFY(cursor.position() == 2);
+    QCOMPARE(cursor.position(), 2);
     cursor.deleteChar();
-    QVERIFY(doc->toPlainText().length() == 5);
+    QCOMPARE(doc->toPlainText().length(), 5);
     cursor.deletePreviousChar();
-    QVERIFY(cursor.position() == 2);
-    QVERIFY(doc->toPlainText().length() == 5);
+    QCOMPARE(cursor.position(), 2);
+    QCOMPARE(doc->toPlainText().length(), 5);
 
     QTextTable *table = cursor.currentTable();
-    QVERIFY(table->rows() == 2);
-    QVERIFY(table->columns() == 2);
+    QCOMPARE(table->rows(), 2);
+    QCOMPARE(table->columns(), 2);
 
     table->insertRows(2, 1);
-    QVERIFY(table->rows() == 3);
-    QVERIFY(table->columns() == 2);
-    QVERIFY(doc->toPlainText().length() == 7);
+    QCOMPARE(table->rows(), 3);
+    QCOMPARE(table->columns(), 2);
+    QCOMPARE(doc->toPlainText().length(), 7);
     table->insertColumns(2, 2);
-    QVERIFY(table->rows() == 3);
-    QVERIFY(table->columns() == 4);
-    QVERIFY(doc->toPlainText().length() == 13);
+    QCOMPARE(table->rows(), 3);
+    QCOMPARE(table->columns(), 4);
+    QCOMPARE(doc->toPlainText().length(), 13);
 
     table->resize(4, 5);
-    QVERIFY(table->rows() == 4);
-    QVERIFY(table->columns() == 5);
-    QVERIFY(doc->toPlainText().length() == 21);
+    QCOMPARE(table->rows(), 4);
+    QCOMPARE(table->columns(), 5);
+    QCOMPARE(doc->toPlainText().length(), 21);
 }
 
 void tst_QTextTable::tableShrinking()
@@ -234,25 +234,25 @@ void tst_QTextTable::tableShrinking()
     QTextTableFormat tableFmt;
 
     cursor.insertTable(3, 4, tableFmt);
-    QVERIFY(doc->toPlainText().length() == 13);
+    QCOMPARE(doc->toPlainText().length(), 13);
 
     QTextTable *table = cursor.currentTable();
-    QVERIFY(table->rows() == 3);
-    QVERIFY(table->columns() == 4);
+    QCOMPARE(table->rows(), 3);
+    QCOMPARE(table->columns(), 4);
 
     table->removeRows(1, 1);
-    QVERIFY(table->rows() == 2);
-    QVERIFY(table->columns() == 4);
-    QVERIFY(doc->toPlainText().length() == 9);
+    QCOMPARE(table->rows(), 2);
+    QCOMPARE(table->columns(), 4);
+    QCOMPARE(doc->toPlainText().length(), 9);
     table->removeColumns(1, 2);
-    QVERIFY(table->rows() == 2);
-    QVERIFY(table->columns() == 2);
-    QVERIFY(doc->toPlainText().length() == 5);
+    QCOMPARE(table->rows(), 2);
+    QCOMPARE(table->columns(), 2);
+    QCOMPARE(doc->toPlainText().length(), 5);
 
     table->resize(1, 1);
-    QVERIFY(table->rows() == 1);
-    QVERIFY(table->columns() == 1);
-    QVERIFY(doc->toPlainText().length() == 2);
+    QCOMPARE(table->rows(), 1);
+    QCOMPARE(table->columns(), 1);
+    QCOMPARE(doc->toPlainText().length(), 2);
 }
 
 void tst_QTextTable::spans()
@@ -264,12 +264,12 @@ void tst_QTextTable::spans()
     QTextTable *table = cursor.currentTable();
     QVERIFY(table->cellAt(0, 0) != table->cellAt(0, 1));
     table->mergeCells(0, 0, 1, 2);
-    QVERIFY(table->rows() == 2);
-    QVERIFY(table->columns() == 2);
+    QCOMPARE(table->rows(), 2);
+    QCOMPARE(table->columns(), 2);
     QVERIFY(table->cellAt(0, 0) == table->cellAt(0, 1));
     table->mergeCells(0, 0, 2, 2);
-    QVERIFY(table->rows() == 2);
-    QVERIFY(table->columns() == 2);
+    QCOMPARE(table->rows(), 2);
+    QCOMPARE(table->columns(), 2);
 }
 
 void tst_QTextTable::variousModifications2()
@@ -277,45 +277,45 @@ void tst_QTextTable::variousModifications2()
     QTextTableFormat tableFmt;
 
     cursor.insertTable(2, 5, tableFmt);
-    QVERIFY(doc->toPlainText().length() == 11);
+    QCOMPARE(doc->toPlainText().length(), 11);
     QTextTable *table = cursor.currentTable();
-    QVERIFY(cursor.position() == 1);
-    QVERIFY(table->rows() == 2);
-    QVERIFY(table->columns() == 5);
+    QCOMPARE(cursor.position(), 1);
+    QCOMPARE(table->rows(), 2);
+    QCOMPARE(table->columns(), 5);
 
     table->insertColumns(0, 1);
-    QVERIFY(table->rows() == 2);
-    QVERIFY(table->columns() == 6);
+    QCOMPARE(table->rows(), 2);
+    QCOMPARE(table->columns(), 6);
     table->insertColumns(6, 1);
-    QVERIFY(table->rows() == 2);
-    QVERIFY(table->columns() == 7);
+    QCOMPARE(table->rows(), 2);
+    QCOMPARE(table->columns(), 7);
 
     table->insertRows(0, 1);
-    QVERIFY(table->rows() == 3);
-    QVERIFY(table->columns() == 7);
+    QCOMPARE(table->rows(), 3);
+    QCOMPARE(table->columns(), 7);
     table->insertRows(3, 1);
-    QVERIFY(table->rows() == 4);
-    QVERIFY(table->columns() == 7);
+    QCOMPARE(table->rows(), 4);
+    QCOMPARE(table->columns(), 7);
 
     table->removeRows(0, 1);
-    QVERIFY(table->rows() == 3);
-    QVERIFY(table->columns() == 7);
+    QCOMPARE(table->rows(), 3);
+    QCOMPARE(table->columns(), 7);
     table->removeRows(2, 1);
-    QVERIFY(table->rows() == 2);
-    QVERIFY(table->columns() == 7);
+    QCOMPARE(table->rows(), 2);
+    QCOMPARE(table->columns(), 7);
 
     table->removeColumns(0, 1);
-    QVERIFY(table->rows() == 2);
-    QVERIFY(table->columns() == 6);
+    QCOMPARE(table->rows(), 2);
+    QCOMPARE(table->columns(), 6);
     table->removeColumns(5, 1);
-    QVERIFY(table->rows() == 2);
-    QVERIFY(table->columns() == 5);
+    QCOMPARE(table->rows(), 2);
+    QCOMPARE(table->columns(), 5);
 
     tableFmt = table->format();
     table->insertColumns(2, 1);
     table->setFormat(tableFmt);
     table->insertColumns(2, 1);
-    QVERIFY(table->columns() == 7);
+    QCOMPARE(table->columns(), 7);
 }
 
 void tst_QTextTable::tableManager_undo()
@@ -325,16 +325,16 @@ void tst_QTextTable::tableManager_undo()
     QTextTable *table = cursor.insertTable(2, 2, fmt);
     QVERIFY(table);
 
-    QVERIFY(table->format().border() == 10);
+    QCOMPARE(table->format().border(), qreal(10));
 
     fmt.setBorder(20);
     table->setFormat(fmt);
 
-    QVERIFY(table->format().border() == 20);
+    QCOMPARE(table->format().border(), qreal(20));
 
     doc->undo();
 
-    QVERIFY(table->format().border() == 10);
+    QCOMPARE(table->format().border(), qreal(10));
 }
 
 void tst_QTextTable::tableManager_removeCell()
@@ -360,10 +360,10 @@ void tst_QTextTable::rowAt()
     QTextCursor cell20Cursor = table->cellAt(2, 0).firstCursorPosition();
     QTextCursor cell21Cursor = table->cellAt(2, 1).firstCursorPosition();
     QTextCursor cell30Cursor = table->cellAt(3, 0).firstCursorPosition();
-    QVERIFY(table->cellAt(cell00Cursor).firstCursorPosition() == cell00Cursor);
-    QVERIFY(table->cellAt(cell10Cursor).firstCursorPosition() == cell10Cursor);
-    QVERIFY(table->cellAt(cell20Cursor).firstCursorPosition() == cell20Cursor);
-    QVERIFY(table->cellAt(cell30Cursor).firstCursorPosition() == cell30Cursor);
+    QCOMPARE(table->cellAt(cell00Cursor).firstCursorPosition(), cell00Cursor);
+    QCOMPARE(table->cellAt(cell10Cursor).firstCursorPosition(), cell10Cursor);
+    QCOMPARE(table->cellAt(cell20Cursor).firstCursorPosition(), cell20Cursor);
+    QCOMPARE(table->cellAt(cell30Cursor).firstCursorPosition(), cell30Cursor);
 
     table->mergeCells(1, 0, 2, 1);
 
@@ -433,16 +433,16 @@ void tst_QTextTable::insertRows()
     QVERIFY(cursor == table->cellAt(0, 0).firstCursorPosition());
 
     table->insertRows(0, 1);
-    QVERIFY(table->rows() == 3);
+    QCOMPARE(table->rows(), 3);
 
     table->insertRows(1, 1);
-    QVERIFY(table->rows() == 4);
+    QCOMPARE(table->rows(), 4);
 
     table->insertRows(-1, 1);
-    QVERIFY(table->rows() == 5);
+    QCOMPARE(table->rows(), 5);
 
     table->insertRows(5, 2);
-    QVERIFY(table->rows() == 7);
+    QCOMPARE(table->rows(), 7);
 
 }
 
@@ -552,9 +552,9 @@ void tst_QTextTable::mergeCells()
 
     QTextBlock block = table->cellAt(0, 0).firstCursorPosition().block();
 
-    QVERIFY(block.text() == "Blah Foo");
-    QVERIFY(block.next().text() == "Hah");
-    QVERIFY(block.next().next().text() == "Bar");
+    QCOMPARE(block.text(), QLatin1String("Blah Foo"));
+    QCOMPARE(block.next().text(), QLatin1String("Hah"));
+    QCOMPARE(block.next().next().text(), QLatin1String("Bar"));
 
     table = create4x4Table();
 
@@ -580,7 +580,7 @@ void tst_QTextTable::mergeCells()
     if (table) {
         cursor = table->cellAt(0, 0).firstCursorPosition();
 
-        QVERIFY(cursor.block().text() == "Test");
+        QCOMPARE(cursor.block().text(), QLatin1String("Test"));
     }
 
     table = create2x2Table();
@@ -750,7 +750,7 @@ void tst_QTextTable::setCellFormat()
     fmt.setTableCellColumnSpan(25);
     fmt.setTableCellRowSpan(42);
     cell.setFormat(fmt);
-    QVERIFY(cell.format().background().color() == QColor(Qt::blue));
+    QCOMPARE(cell.format().background().color(), QColor(Qt::blue));
     QCOMPARE(cell.format().tableCellColumnSpan(), 1);
     QCOMPARE(cell.format().tableCellRowSpan(), 1);
 }