Merge commit 'dev' into 'wip/cmake-merge'

Change-Id: I176c40d031be26a1dd1cf08843e448a660598783

1 files changed, 6 insertions, 6 deletions

diff --git a/examples/widgets/graphicsview/embeddeddialogs/customproxy.cpp b/examples/widgets/graphicsview/embeddeddialogs/customproxy.cpp
index 158c31d9c1..f510ebc07f 100644
--- a/examples/widgets/graphicsview/embeddeddialogs/customproxy.cpp
+++ b/examples/widgets/graphicsview/embeddeddialogs/customproxy.cpp
@@ -55,13 +55,13 @@
 #include <QGraphicsScene>
 
 CustomProxy::CustomProxy(QGraphicsItem *parent, Qt::WindowFlags wFlags)
-    : QGraphicsProxyWidget(parent, wFlags), popupShown(false), currentPopup(0)
+    : QGraphicsProxyWidget(parent, wFlags), popupShown(false), currentPopup(nullptr)
 {
     timeLine = new QTimeLine(250, this);
-    connect(timeLine, SIGNAL(valueChanged(qreal)),
-            this, SLOT(updateStep(qreal)));
-    connect(timeLine, SIGNAL(stateChanged(QTimeLine::State)),
-            this, SLOT(stateChanged(QTimeLine::State)));
+    connect(timeLine, &QTimeLine::valueChanged,
+            this, &CustomProxy::updateStep);
+    connect(timeLine, &QTimeLine::stateChanged,
+            this, &CustomProxy::stateChanged);
 }
 
 QRectF CustomProxy::boundingRect() const
@@ -133,7 +133,7 @@ QVariant CustomProxy::itemChange(GraphicsItemChange change, const QVariant &valu
                 currentPopup->installSceneEventFilter(this);
         } else if (scene()) {
             currentPopup->removeSceneEventFilter(this);
-            currentPopup = 0;
+            currentPopup = nullptr;
         }
     } else if (currentPopup && change == ItemSceneHasChanged) {
         currentPopup->installSceneEventFilter(this);