Merge remote-tracking branch 'origin/dev' into merge-dev

Change-Id: I31b761cfd5ea01373c60d02a5da8c33398d34739

1 files changed, 3 insertions, 3 deletions

diff --git a/src/gui/kernel/qdrag.cpp b/src/gui/kernel/qdrag.cpp
index 8e2f7be23e5..3712eace154 100644
--- a/src/gui/kernel/qdrag.cpp
+++ b/src/gui/kernel/qdrag.cpp
@@ -112,8 +112,8 @@ QDrag::QDrag(QObject *dragSource)
 {
     Q_D(QDrag);
     d->source = dragSource;
-    d->target = 0;
-    d->data = 0;
+    d->target = nullptr;
+    d->data = nullptr;
     d->hotspot = QPoint(-10, -10);
     d->executed_action = Qt::IgnoreAction;
     d->supported_actions = Qt::IgnoreAction;
@@ -138,7 +138,7 @@ void QDrag::setMimeData(QMimeData *data)
     Q_D(QDrag);
     if (d->data == data)
         return;
-    if (d->data != 0)
+    if (d->data != nullptr)
         delete d->data;
     d->data = data;
 }