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

Change-Id: I31b761cfd5ea01373c60d02a5da8c33398d34739

1 files changed, 5 insertions, 5 deletions

diff --git a/src/widgets/util/qscroller.cpp b/src/widgets/util/qscroller.cpp
index df05bbf71c2..fec373d45c7 100644
--- a/src/widgets/util/qscroller.cpp
+++ b/src/widgets/util/qscroller.cpp
@@ -300,7 +300,7 @@ QScroller *QScroller::scroller(QObject *target)
 {
     if (!target) {
         qWarning("QScroller::scroller() was called with a null target.");
-        return 0;
+        return nullptr;
     }
 
     if (qt_allScrollers()->contains(target))
@@ -476,7 +476,7 @@ void QScroller::ungrabGesture(QObject *target)
 
     QGestureRecognizer::unregisterRecognizer(sp->recognizerType);
     // do not delete the recognizer. The QGestureManager is doing this.
-    sp->recognizer = 0;
+    sp->recognizer = nullptr;
 }
 
 #endif // QT_NO_GESTURES
@@ -502,7 +502,7 @@ QScroller::~QScroller()
 #ifndef QT_NO_GESTURES
     QGestureRecognizer::unregisterRecognizer(d->recognizerType);
     // do not delete the recognizer. The QGestureManager is doing this.
-    d->recognizer = 0;
+    d->recognizer = nullptr;
 #endif
     qt_allScrollers()->remove(d->target);
     qt_activeScrollers()->removeOne(this);
@@ -879,7 +879,7 @@ void QScroller::setSnapPositionsY(qreal first, qreal interval)
 QScrollerPrivate::QScrollerPrivate(QScroller *q, QObject *_target)
     : target(_target)
 #ifndef QT_NO_GESTURES
-    , recognizer(0)
+    , recognizer(nullptr)
     , recognizerType(Qt::CustomGesture)
 #endif
     , state(QScroller::Inactive)
@@ -900,7 +900,7 @@ QScrollerPrivate::QScrollerPrivate(QScroller *q, QObject *_target)
 
 void QScrollerPrivate::init()
 {
-    setDpiFromWidget(0);
+    setDpiFromWidget(nullptr);
     monotonicTimer.start();
 }