C++11 keywords

- Q_NULLPTR -> nullptr
- Q_DECL_OVERRIDE -> override

Change-Id: I8ee65caafd43ab41b6de43835200cac6c8ffa278
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/tests/auto/applicationwindow/tst_applicationwindow.cpp b/tests/auto/applicationwindow/tst_applicationwindow.cpp
index 8256f16b..11d45182 100644
--- a/tests/auto/applicationwindow/tst_applicationwindow.cpp
+++ b/tests/auto/applicationwindow/tst_applicationwindow.cpp
@@ -417,7 +417,7 @@ void tst_applicationwindow::attachedProperties()
     QCOMPARE(childItem->property("attached_footer").value<QQuickItem *>(), childAppWindow->footer());
     QCOMPARE(childItem->property("attached_overlay").value<QQuickItem *>(), childAppWindow->overlay());
 
-    childControl->setParentItem(Q_NULLPTR);
+    childControl->setParentItem(nullptr);
     QVERIFY(!childControl->window());
     QVERIFY(!childControl->property("attached_window").value<QQuickApplicationWindow *>());
     QVERIFY(!childControl->property("attached_contentItem").value<QQuickItem *>());
@@ -426,7 +426,7 @@ void tst_applicationwindow::attachedProperties()
     QVERIFY(!childControl->property("attached_footer").value<QQuickItem *>());
     QVERIFY(!childControl->property("attached_overlay").value<QQuickItem *>());
 
-    childItem->setParentItem(Q_NULLPTR);
+    childItem->setParentItem(nullptr);
     QVERIFY(!childItem->window());
     QVERIFY(!childItem->property("attached_window").value<QQuickApplicationWindow *>());
     QVERIFY(!childItem->property("attached_contentItem").value<QQuickItem *>());