From ded7536c90023fdf5f643a180ced405643ba7ab5 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Tue, 2 Apr 2019 11:42:23 +0200
Subject: Remove our last uses of Q_DECL_OVERRIDE and Q_NULLPTR
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I8806a3fb466006f14cf92f17510cdea8b50e8345
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
---
 src/webengine/ui_delegates_manager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/webengine/ui_delegates_manager.cpp')

diff --git a/src/webengine/ui_delegates_manager.cpp b/src/webengine/ui_delegates_manager.cpp
index da120ab69..a30fa7b98 100644
--- a/src/webengine/ui_delegates_manager.cpp
+++ b/src/webengine/ui_delegates_manager.cpp
@@ -324,7 +324,7 @@ void UIDelegatesManager::showDialog(QSharedPointer<JavaScriptDialogController> d
         return;
     }
 
-    QQmlComponent *dialogComponent = Q_NULLPTR;
+    QQmlComponent *dialogComponent = nullptr;
     switch (dialogComponentType) {
     FOR_EACH_COMPONENT_TYPE(ASSIGN_DIALOG_COMPONENT_DATA_CASE_STATEMENT, NO_SEPARATOR)
     default:
-- 
cgit v1.2.3