use nullptr consistently (clang-tidy)

From now on we prefer nullptr instead of 0 to clarify cases where
we are assigning or testing a pointer rather than a numeric zero.

Also, replaced cases where 0 was passed as Qt::KeyboardModifiers
with Qt::NoModifier (clang-tidy replaced them with nullptr, which
waas wrong, so it was just as well to make the tests more readable
rather than to revert those lines).

Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

1 files changed, 74 insertions, 74 deletions

diff --git a/tests/auto/quick/qquicktext/tst_qquicktext.cpp b/tests/auto/quick/qquicktext/tst_qquicktext.cpp
index 6fa898e9fb..609a84ce82 100644
--- a/tests/auto/quick/qquicktext/tst_qquicktext.cpp
+++ b/tests/auto/quick/qquicktext/tst_qquicktext.cpp
@@ -238,7 +238,7 @@ tst_qquicktext::tst_qquicktext()
 
 QQuickView *tst_qquicktext::createView(const QString &filename)
 {
-    QQuickView *window = new QQuickView(0);
+    QQuickView *window = new QQuickView(nullptr);
 
     window->setSource(QUrl::fromLocalFile(filename));
     return window;
@@ -251,7 +251,7 @@ void tst_qquicktext::text()
         textComponent.setData("import QtQuick 2.0\nText { text: \"\" }", QUrl::fromLocalFile(""));
         QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create());
 
-        QVERIFY(textObject != 0);
+        QVERIFY(textObject != nullptr);
         QCOMPARE(textObject->text(), QString(""));
         QCOMPARE(textObject->width(), qreal(0));
 
@@ -266,7 +266,7 @@ void tst_qquicktext::text()
 
         QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create());
 
-        QVERIFY(textObject != 0);
+        QVERIFY(textObject != nullptr);
         QCOMPARE(textObject->text(), standard.at(i));
         QVERIFY(textObject->width() > 0);
 
@@ -280,7 +280,7 @@ void tst_qquicktext::text()
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
         QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create());
 
-        QVERIFY(textObject != 0);
+        QVERIFY(textObject != nullptr);
         QString expected = richText.at(i);
         QCOMPARE(textObject->text(), expected.replace("\\\"", "\""));
         QVERIFY(textObject->width() > 0);
@@ -297,7 +297,7 @@ void tst_qquicktext::width()
         textComponent.setData("import QtQuick 2.0\nText { text: \"\" }", QUrl::fromLocalFile(""));
         QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create());
 
-        QVERIFY(textObject != 0);
+        QVERIFY(textObject != nullptr);
         QCOMPARE(textObject->width(), 0.);
 
         delete textObject;
@@ -344,7 +344,7 @@ void tst_qquicktext::width()
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
         QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create());
 
-        QVERIFY(textObject != 0);
+        QVERIFY(textObject != nullptr);
         QVERIFY(textObject->boundingRect().width() > 0);
         QCOMPARE(textObject->width(), qreal(metricWidth));
         QVERIFY(textObject->textFormat() == QQuickText::AutoText); // setting text doesn't change format
@@ -360,14 +360,14 @@ void tst_qquicktext::width()
         QQmlComponent textComponent(&engine);
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
         QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create());
-        QVERIFY(textObject != 0);
+        QVERIFY(textObject != nullptr);
 
         QQuickTextPrivate *textPrivate = QQuickTextPrivate::get(textObject);
-        QVERIFY(textPrivate != 0);
+        QVERIFY(textPrivate != nullptr);
         QVERIFY(textPrivate->extra.isAllocated());
 
         QTextDocument *doc = textPrivate->extra->doc;
-        QVERIFY(doc != 0);
+        QVERIFY(doc != nullptr);
 
         QCOMPARE(int(textObject->width()), int(doc->idealWidth()));
         QCOMPARE(textObject->textFormat(), QQuickText::RichText);
@@ -386,7 +386,7 @@ void tst_qquicktext::wrap()
         QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create());
         textHeight = textObject->height();
 
-        QVERIFY(textObject != 0);
+        QVERIFY(textObject != nullptr);
         QCOMPARE(textObject->wrapMode(), QQuickText::WordWrap);
         QCOMPARE(textObject->width(), 300.);
 
@@ -400,7 +400,7 @@ void tst_qquicktext::wrap()
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
         QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create());
 
-        QVERIFY(textObject != 0);
+        QVERIFY(textObject != nullptr);
         QCOMPARE(textObject->width(), 30.);
         QVERIFY(textObject->height() > textHeight);
 
@@ -418,7 +418,7 @@ void tst_qquicktext::wrap()
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
         QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create());
 
-        QVERIFY(textObject != 0);
+        QVERIFY(textObject != nullptr);
         QCOMPARE(textObject->width(), 30.);
         QVERIFY(textObject->height() > textHeight);
 
@@ -437,16 +437,16 @@ void tst_qquicktext::wrap()
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
         QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create());
 
-        QVERIFY(textObject != 0);
+        QVERIFY(textObject != nullptr);
         QCOMPARE(textObject->width(), 30.);
         QVERIFY(textObject->height() > textHeight);
 
         QQuickTextPrivate *textPrivate = QQuickTextPrivate::get(textObject);
-        QVERIFY(textPrivate != 0);
+        QVERIFY(textPrivate != nullptr);
         QVERIFY(textPrivate->extra.isAllocated());
 
         QTextDocument *doc = textPrivate->extra->doc;
-        QVERIFY(doc != 0);
+        QVERIFY(doc != nullptr);
         textObject->setWidth(doc->idealWidth());
         QCOMPARE(textObject->width(), doc->idealWidth());
         QVERIFY(textObject->height() > textHeight);
@@ -466,7 +466,7 @@ void tst_qquicktext::wrap()
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
         QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create());
 
-        QVERIFY(textObject != 0);
+        QVERIFY(textObject != nullptr);
         QCOMPARE(textObject->width(), 30.);
         QVERIFY(textObject->implicitHeight() > textHeight);
 
@@ -567,7 +567,7 @@ void tst_qquicktext::multilineElide()
     QScopedPointer<QQuickView> window(createView(testFile("multilineelide.qml")));
 
     QQuickText *myText = qobject_cast<QQuickText*>(window->rootObject());
-    QVERIFY(myText != 0);
+    QVERIFY(myText != nullptr);
     myText->setTextFormat(format);
 
     QCOMPARE(myText->lineCount(), 3);
@@ -667,11 +667,11 @@ void tst_qquicktext::textFormat()
         textComponent.setData("import QtQuick 2.0\nText { text: \"Hello\"; textFormat: Text.RichText }", QUrl::fromLocalFile(""));
         QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create());
 
-        QVERIFY(textObject != 0);
+        QVERIFY(textObject != nullptr);
         QCOMPARE(textObject->textFormat(), QQuickText::RichText);
 
         QQuickTextPrivate *textPrivate = QQuickTextPrivate::get(textObject);
-        QVERIFY(textPrivate != 0);
+        QVERIFY(textPrivate != nullptr);
         QVERIFY(textPrivate->richText);
 
         delete textObject;
@@ -681,11 +681,11 @@ void tst_qquicktext::textFormat()
         textComponent.setData("import QtQuick 2.0\nText { text: \"<b>Hello</b>\" }", QUrl::fromLocalFile(""));
         QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create());
 
-        QVERIFY(textObject != 0);
+        QVERIFY(textObject != nullptr);
         QCOMPARE(textObject->textFormat(), QQuickText::AutoText);
 
         QQuickTextPrivate *textPrivate = QQuickTextPrivate::get(textObject);
-        QVERIFY(textPrivate != 0);
+        QVERIFY(textPrivate != nullptr);
         QVERIFY(textPrivate->styledText);
 
         delete textObject;
@@ -695,7 +695,7 @@ void tst_qquicktext::textFormat()
         textComponent.setData("import QtQuick 2.0\nText { text: \"<b>Hello</b>\"; textFormat: Text.PlainText }", QUrl::fromLocalFile(""));
         QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create());
 
-        QVERIFY(textObject != 0);
+        QVERIFY(textObject != nullptr);
         QCOMPARE(textObject->textFormat(), QQuickText::PlainText);
 
         delete textObject;
@@ -821,11 +821,11 @@ void tst_qquicktext::horizontalAlignment_RightToLeft()
 {
     QScopedPointer<QQuickView> window(createView(testFile("horizontalAlignment_RightToLeft.qml")));
     QQuickText *text = window->rootObject()->findChild<QQuickText*>("text");
-    QVERIFY(text != 0);
+    QVERIFY(text != nullptr);
     window->showNormal();
 
     QQuickTextPrivate *textPrivate = QQuickTextPrivate::get(text);
-    QVERIFY(textPrivate != 0);
+    QVERIFY(textPrivate != nullptr);
 
     QTRY_VERIFY(textPrivate->layout.lineCount());
 
@@ -965,7 +965,7 @@ void tst_qquicktext::hAlignImplicitWidth()
     QVERIFY(QTest::qWaitForWindowActive(&view));
 
     QQuickText *text = view.rootObject()->findChild<QQuickText*>("textItem");
-    QVERIFY(text != 0);
+    QVERIFY(text != nullptr);
 
     // Try to check whether alignment works by checking the number of black
     // pixels in the thirds of the grabbed image.
@@ -1032,7 +1032,7 @@ void tst_qquicktext::verticalAlignment()
             textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
             QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create());
 
-            QVERIFY(textObject != 0);
+            QVERIFY(textObject != nullptr);
             QCOMPARE((int)textObject->vAlign(), (int)verticalAlignmentments.at(j));
 
             delete textObject;
@@ -1048,7 +1048,7 @@ void tst_qquicktext::verticalAlignment()
             textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
             QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create());
 
-            QVERIFY(textObject != 0);
+            QVERIFY(textObject != nullptr);
             QCOMPARE((int)textObject->vAlign(), (int)verticalAlignmentments.at(j));
 
             delete textObject;
@@ -1444,7 +1444,7 @@ void tst_qquicktext::weight()
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
         QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create());
 
-        QVERIFY(textObject != 0);
+        QVERIFY(textObject != nullptr);
         QCOMPARE((int)textObject->font().weight(), (int)QQuickFontValueType::Normal);
 
         delete textObject;
@@ -1455,7 +1455,7 @@ void tst_qquicktext::weight()
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
         QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create());
 
-        QVERIFY(textObject != 0);
+        QVERIFY(textObject != nullptr);
         QCOMPARE((int)textObject->font().weight(), (int)QQuickFontValueType::Bold);
 
         delete textObject;
@@ -1469,7 +1469,7 @@ void tst_qquicktext::underline()
     view.requestActivate();
     QVERIFY(QTest::qWaitForWindowActive(&view));
     QQuickText *textObject = view.rootObject()->findChild<QQuickText*>("myText");
-    QVERIFY(textObject != 0);
+    QVERIFY(textObject != nullptr);
     QCOMPARE(textObject->font().overline(), false);
     QCOMPARE(textObject->font().underline(), true);
     QCOMPARE(textObject->font().strikeOut(), false);
@@ -1482,7 +1482,7 @@ void tst_qquicktext::overline()
     view.requestActivate();
     QVERIFY(QTest::qWaitForWindowActive(&view));
     QQuickText *textObject = view.rootObject()->findChild<QQuickText*>("myText");
-    QVERIFY(textObject != 0);
+    QVERIFY(textObject != nullptr);
     QCOMPARE(textObject->font().overline(), true);
     QCOMPARE(textObject->font().underline(), false);
     QCOMPARE(textObject->font().strikeOut(), false);
@@ -1495,7 +1495,7 @@ void tst_qquicktext::strikeout()
     view.requestActivate();
     QVERIFY(QTest::qWaitForWindowActive(&view));
     QQuickText *textObject = view.rootObject()->findChild<QQuickText*>("myText");
-    QVERIFY(textObject != 0);
+    QVERIFY(textObject != nullptr);
     QCOMPARE(textObject->font().overline(), false);
     QCOMPARE(textObject->font().underline(), false);
     QCOMPARE(textObject->font().strikeOut(), true);
@@ -1509,7 +1509,7 @@ void tst_qquicktext::capitalization()
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
         QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create());
 
-        QVERIFY(textObject != 0);
+        QVERIFY(textObject != nullptr);
         QCOMPARE((int)textObject->font().capitalization(), (int)QQuickFontValueType::MixedCase);
 
         delete textObject;
@@ -1520,7 +1520,7 @@ void tst_qquicktext::capitalization()
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
         QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create());
 
-        QVERIFY(textObject != 0);
+        QVERIFY(textObject != nullptr);
         QCOMPARE((int)textObject->font().capitalization(), (int)QQuickFontValueType::AllUppercase);
 
         delete textObject;
@@ -1531,7 +1531,7 @@ void tst_qquicktext::capitalization()
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
         QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create());
 
-        QVERIFY(textObject != 0);
+        QVERIFY(textObject != nullptr);
         QCOMPARE((int)textObject->font().capitalization(), (int)QQuickFontValueType::AllLowercase);
 
         delete textObject;
@@ -1542,7 +1542,7 @@ void tst_qquicktext::capitalization()
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
         QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create());
 
-        QVERIFY(textObject != 0);
+        QVERIFY(textObject != nullptr);
         QCOMPARE((int)textObject->font().capitalization(), (int)QQuickFontValueType::SmallCaps);
 
         delete textObject;
@@ -1553,7 +1553,7 @@ void tst_qquicktext::capitalization()
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
         QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create());
 
-        QVERIFY(textObject != 0);
+        QVERIFY(textObject != nullptr);
         QCOMPARE((int)textObject->font().capitalization(), (int)QQuickFontValueType::Capitalize);
 
         delete textObject;
@@ -1568,7 +1568,7 @@ void tst_qquicktext::letterSpacing()
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
         QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create());
 
-        QVERIFY(textObject != 0);
+        QVERIFY(textObject != nullptr);
         QCOMPARE(textObject->font().letterSpacing(), 0.0);
 
         delete textObject;
@@ -1579,7 +1579,7 @@ void tst_qquicktext::letterSpacing()
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
         QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create());
 
-        QVERIFY(textObject != 0);
+        QVERIFY(textObject != nullptr);
         QCOMPARE(textObject->font().letterSpacing(), -2.);
 
         delete textObject;
@@ -1590,7 +1590,7 @@ void tst_qquicktext::letterSpacing()
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
         QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create());
 
-        QVERIFY(textObject != 0);
+        QVERIFY(textObject != nullptr);
         QCOMPARE(textObject->font().letterSpacing(), 3.);
 
         delete textObject;
@@ -1605,7 +1605,7 @@ void tst_qquicktext::wordSpacing()
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
         QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create());
 
-        QVERIFY(textObject != 0);
+        QVERIFY(textObject != nullptr);
         QCOMPARE(textObject->font().wordSpacing(), 0.0);
 
         delete textObject;
@@ -1616,7 +1616,7 @@ void tst_qquicktext::wordSpacing()
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
         QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create());
 
-        QVERIFY(textObject != 0);
+        QVERIFY(textObject != nullptr);
         QCOMPARE(textObject->font().wordSpacing(), -50.);
 
         delete textObject;
@@ -1627,7 +1627,7 @@ void tst_qquicktext::wordSpacing()
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
         QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create());
 
-        QVERIFY(textObject != 0);
+        QVERIFY(textObject != nullptr);
         QCOMPARE(textObject->font().wordSpacing(), 200.);
 
         delete textObject;
@@ -2024,7 +2024,7 @@ void tst_qquicktext::linkInteraction()
     textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
     QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create());
 
-    QVERIFY(textObject != 0);
+    QVERIFY(textObject != nullptr);
 
     LinkTest test;
     QObject::connect(textObject, SIGNAL(linkActivated(QString)), &test, SLOT(linkClicked(QString)));
@@ -2146,7 +2146,7 @@ void tst_qquicktext::embeddedImages()
     QVERIFY(QTest::qWaitForWindowActive(view));
     QQuickText *textObject = qobject_cast<QQuickText*>(view->rootObject());
 
-    QVERIFY(textObject != 0);
+    QVERIFY(textObject != nullptr);
     QTRY_COMPARE(textObject->resourcesLoading(), 0);
 
     QPixmap pm(testFile("http/exists.png"));
@@ -2167,7 +2167,7 @@ void tst_qquicktext::lineCount()
     QScopedPointer<QQuickView> window(createView(testFile("lineCount.qml")));
 
     QQuickText *myText = window->rootObject()->findChild<QQuickText*>("myText");
-    QVERIFY(myText != 0);
+    QVERIFY(myText != nullptr);
 
     QVERIFY(myText->lineCount() > 1);
     QVERIFY(!myText->truncated());
@@ -2194,7 +2194,7 @@ void tst_qquicktext::lineHeight()
     QScopedPointer<QQuickView> window(createView(testFile("lineHeight.qml")));
 
     QQuickText *myText = window->rootObject()->findChild<QQuickText*>("myText");
-    QVERIFY(myText != 0);
+    QVERIFY(myText != nullptr);
 
     QCOMPARE(myText->lineHeight(), qreal(1));
     QCOMPARE(myText->lineHeightMode(), QQuickText::ProportionalHeight);
@@ -2792,10 +2792,10 @@ void tst_qquicktext::lineLaidOut()
     QScopedPointer<QQuickView> window(createView(testFile("lineLayout.qml")));
 
     QQuickText *myText = window->rootObject()->findChild<QQuickText*>("myText");
-    QVERIFY(myText != 0);
+    QVERIFY(myText != nullptr);
 
     QQuickTextPrivate *textPrivate = QQuickTextPrivate::get(myText);
-    QVERIFY(textPrivate != 0);
+    QVERIFY(textPrivate != nullptr);
 
     QVERIFY(!textPrivate->extra.isAllocated());
 
@@ -2820,10 +2820,10 @@ void tst_qquicktext::lineLaidOutRelayout()
     QVERIFY(QTest::qWaitForWindowActive(window.data()));
 
     QQuickText *myText = window->rootObject()->findChild<QQuickText*>("myText");
-    QVERIFY(myText != 0);
+    QVERIFY(myText != nullptr);
 
     QQuickTextPrivate *textPrivate = QQuickTextPrivate::get(myText);
-    QVERIFY(textPrivate != 0);
+    QVERIFY(textPrivate != nullptr);
 
     QVERIFY(!textPrivate->extra.isAllocated());
 
@@ -2848,10 +2848,10 @@ void tst_qquicktext::lineLaidOutHAlign()
     QScopedPointer<QQuickView> window(createView(testFile("lineLayoutHAlign.qml")));
 
     QQuickText *myText = window->rootObject()->findChild<QQuickText*>("myText");
-    QVERIFY(myText != 0);
+    QVERIFY(myText != nullptr);
 
     QQuickTextPrivate *textPrivate = QQuickTextPrivate::get(myText);
-    QVERIFY(textPrivate != 0);
+    QVERIFY(textPrivate != nullptr);
 
     QCOMPARE(textPrivate->layout.lineCount(), 1);
 
@@ -2978,11 +2978,11 @@ void tst_qquicktext::imgTagsAlign()
     textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile("."));
     QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create());
 
-    QVERIFY(textObject != 0);
+    QVERIFY(textObject != nullptr);
     QCOMPARE(textObject->height(), qreal(imgHeight));
 
     QQuickTextPrivate *textPrivate = QQuickTextPrivate::get(textObject);
-    QVERIFY(textPrivate != 0);
+    QVERIFY(textPrivate != nullptr);
 
     QRectF br = textPrivate->layout.boundingRect();
     if (align == "bottom")
@@ -3003,11 +3003,11 @@ void tst_qquicktext::imgTagsMultipleImages()
     textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile("."));
     QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create());
 
-    QVERIFY(textObject != 0);
+    QVERIFY(textObject != nullptr);
     QCOMPARE(textObject->height(), qreal(85));
 
     QQuickTextPrivate *textPrivate = QQuickTextPrivate::get(textObject);
-    QVERIFY(textPrivate != 0);
+    QVERIFY(textPrivate != nullptr);
     QCOMPARE(textPrivate->extra->visibleImgTags.count(), 2);
 
     delete textObject;
@@ -3017,10 +3017,10 @@ void tst_qquicktext::imgTagsElide()
 {
     QScopedPointer<QQuickView> window(createView(testFile("imgTagsElide.qml")));
     QQuickText *myText = window->rootObject()->findChild<QQuickText*>("myText");
-    QVERIFY(myText != 0);
+    QVERIFY(myText != nullptr);
 
     QQuickTextPrivate *textPrivate = QQuickTextPrivate::get(myText);
-    QVERIFY(textPrivate != 0);
+    QVERIFY(textPrivate != nullptr);
     QCOMPARE(textPrivate->extra->visibleImgTags.count(), 0);
     myText->setMaximumLineCount(20);
     QTRY_COMPARE(textPrivate->extra->visibleImgTags.count(), 1);
@@ -3032,12 +3032,12 @@ void tst_qquicktext::imgTagsUpdates()
 {
     QScopedPointer<QQuickView> window(createView(testFile("imgTagsUpdates.qml")));
     QQuickText *myText = window->rootObject()->findChild<QQuickText*>("myText");
-    QVERIFY(myText != 0);
+    QVERIFY(myText != nullptr);
 
     QSignalSpy spy(myText, SIGNAL(contentSizeChanged()));
 
     QQuickTextPrivate *textPrivate = QQuickTextPrivate::get(myText);
-    QVERIFY(textPrivate != 0);
+    QVERIFY(textPrivate != nullptr);
 
     myText->setText("This is a heart<img src=\"images/heart200.png\">.");
     QCOMPARE(textPrivate->extra->visibleImgTags.count(), 1);
@@ -3063,7 +3063,7 @@ void tst_qquicktext::imgTagsError()
     textComponent.setData(componentStr.toLatin1(), QUrl("file:"));
     QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create());
 
-    QVERIFY(textObject != 0);
+    QVERIFY(textObject != nullptr);
     delete textObject;
 }
 
@@ -3082,7 +3082,7 @@ void tst_qquicktext::fontSizeMode()
     window->show();
 
     QQuickText *myText = window->rootObject()->findChild<QQuickText*>("myText");
-    QVERIFY(myText != 0);
+    QVERIFY(myText != nullptr);
 
     myText->setText(text);
     QTRY_COMPARE(QQuickItemPrivate::get(myText)->polishScheduled, false);
@@ -3325,7 +3325,7 @@ void tst_qquicktext::fontSizeModeMultiline()
     window->show();
 
     QQuickText *myText = window->rootObject()->findChild<QQuickText*>("myText");
-    QVERIFY(myText != 0);
+    QVERIFY(myText != nullptr);
 
     myText->setText(text);
     QTRY_COMPARE(QQuickItemPrivate::get(myText)->polishScheduled, false);
@@ -3573,7 +3573,7 @@ void tst_qquicktext::multilengthStrings()
     window->show();
 
     QQuickText *myText = window->rootObject()->findChild<QQuickText*>("myText");
-    QVERIFY(myText != 0);
+    QVERIFY(myText != nullptr);
 
     const QString longText = "the quick brown fox jumped over the lazy dog";
     const QString mediumText = "the brown fox jumped over the dog";
@@ -3653,8 +3653,8 @@ void tst_qquicktext::fontFormatSizes()
 
         QQuickText *qtext = view->rootObject()->findChild<QQuickText*>("text");
         QQuickText *qtextWithTag = view->rootObject()->findChild<QQuickText*>("textWithTag");
-        QVERIFY(qtext != 0);
-        QVERIFY(qtextWithTag != 0);
+        QVERIFY(qtext != nullptr);
+        QVERIFY(qtextWithTag != nullptr);
 
         qtext->setText(text);
         qtextWithTag->setText(textWithTag);
@@ -3672,8 +3672,8 @@ void tst_qquicktext::fontFormatSizes()
         view->setSource(testFileUrl("pixelFontSizes.qml"));
         QQuickText *qtext = view->rootObject()->findChild<QQuickText*>("text");
         QQuickText *qtextWithTag = view->rootObject()->findChild<QQuickText*>("textWithTag");
-        QVERIFY(qtext != 0);
-        QVERIFY(qtextWithTag != 0);
+        QVERIFY(qtext != nullptr);
+        QVERIFY(qtextWithTag != nullptr);
 
         qtext->setText(text);
         qtextWithTag->setText(textWithTag);
@@ -4039,10 +4039,10 @@ void tst_qquicktext::htmlLists()
     QQuickText *textObject = view->rootObject()->findChild<QQuickText*>("myText");
 
     QQuickTextPrivate *textPrivate = QQuickTextPrivate::get(textObject);
-    QVERIFY(textPrivate != 0);
+    QVERIFY(textPrivate != nullptr);
     QVERIFY(textPrivate->extra.isAllocated());
 
-    QVERIFY(textObject != 0);
+    QVERIFY(textObject != nullptr);
     textObject->setText(text);
 
     view->show();
@@ -4139,7 +4139,7 @@ void tst_qquicktext::padding()
     QQuickItem *root = window->rootObject();
     QVERIFY(root);
     QQuickText *obj = qobject_cast<QQuickText*>(root);
-    QVERIFY(obj != 0);
+    QVERIFY(obj != nullptr);
 
     qreal cw = obj->contentWidth();
     qreal ch = obj->contentHeight();
@@ -4227,7 +4227,7 @@ void tst_qquicktext::hintingPreference()
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
         QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create());
 
-        QVERIFY(textObject != 0);
+        QVERIFY(textObject != nullptr);
         QCOMPARE((int)textObject->font().hintingPreference(), (int)QFont::PreferDefaultHinting);
 
         delete textObject;
@@ -4238,7 +4238,7 @@ void tst_qquicktext::hintingPreference()
         textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
         QQuickText *textObject = qobject_cast<QQuickText*>(textComponent.create());
 
-        QVERIFY(textObject != 0);
+        QVERIFY(textObject != nullptr);
         QCOMPARE((int)textObject->font().hintingPreference(), (int)QFont::PreferNoHinting);
 
         delete textObject;