Merge remote-tracking branch 'origin/dev' into wip/scenegraphng

Change-Id: Ib5662d80d5b2f58cf4634c54c054545ba9df807e

1 files changed, 3 insertions, 3 deletions

diff --git a/tests/auto/quicktest/signalspy/tst_signalspy.cpp b/tests/auto/quicktest/signalspy/tst_signalspy.cpp
index f54da7819c..0806f43c1c 100644
--- a/tests/auto/quicktest/signalspy/tst_signalspy.cpp
+++ b/tests/auto/quicktest/signalspy/tst_signalspy.cpp
@@ -58,7 +58,7 @@ void tst_SignalSpy::testValid()
 {
     QQuickView window;
     window.setSource(testFileUrl("signalspy.qml"));
-    QVERIFY(window.rootObject() != 0);
+    QVERIFY(window.rootObject() != nullptr);
 
     QObject *mouseSpy = window.rootObject()->findChild<QObject*>("mouseSpy");
     QVERIFY(mouseSpy->property("valid").toBool());
@@ -73,8 +73,8 @@ void tst_SignalSpy::testCount()
     window.resize(200, 200);
     window.setSource(testFileUrl("signalspy.qml"));
     window.show();
-    QTest::qWaitForWindowActive(&window);
-    QVERIFY(window.rootObject() != 0);
+    QVERIFY(QTest::qWaitForWindowActive(&window));
+    QVERIFY(window.rootObject() != nullptr);
 
     QObject *mouseSpy = window.rootObject()->findChild<QObject*>("mouseSpy");
     QCOMPARE(mouseSpy->property("count").toInt(), 0);