Merge remote-tracking branch 'origin/5.6' into 5.7

Conflicts:
	src/widgets/itemviews/qabstractitemview.cpp
	src/widgets/itemviews/qabstractitemview_p.h

Change-Id: I54589b1365103cb1749186af92aab03a49c94b64

1 files changed, 17 insertions, 14 deletions

diff --git a/examples/widgets/mainwindows/mainwindow/colorswatch.cpp b/examples/widgets/mainwindows/mainwindow/colorswatch.cpp
index 226f335c85..73076c20b0 100644
--- a/examples/widgets/mainwindows/mainwindow/colorswatch.cpp
+++ b/examples/widgets/mainwindows/mainwindow/colorswatch.cpp
@@ -61,6 +61,7 @@
 #include <QDialog>
 #include <QDialogButtonBox>
 #include <QGridLayout>
+#include <QSignalBlocker>
 #include <QSpinBox>
 #include <QLabel>
 #include <QPainterPath>
@@ -426,20 +427,22 @@ void ColorSwatch::updateContextMenu()
         allowBottomAction->setEnabled(area != Qt::BottomDockWidgetArea);
     }
 
-    leftAction->blockSignals(true);
-    rightAction->blockSignals(true);
-    topAction->blockSignals(true);
-    bottomAction->blockSignals(true);
-
-    leftAction->setChecked(area == Qt::LeftDockWidgetArea);
-    rightAction->setChecked(area == Qt::RightDockWidgetArea);
-    topAction->setChecked(area == Qt::TopDockWidgetArea);
-    bottomAction->setChecked(area == Qt::BottomDockWidgetArea);
-
-    leftAction->blockSignals(false);
-    rightAction->blockSignals(false);
-    topAction->blockSignals(false);
-    bottomAction->blockSignals(false);
+    {
+        const QSignalBlocker blocker(leftAction);
+        leftAction->setChecked(area == Qt::LeftDockWidgetArea);
+    }
+    {
+        const QSignalBlocker blocker(rightAction);
+        rightAction->setChecked(area == Qt::RightDockWidgetArea);
+    }
+    {
+        const QSignalBlocker blocker(topAction);
+        topAction->setChecked(area == Qt::TopDockWidgetArea);
+    }
+    {
+        const QSignalBlocker blocker(bottomAction);
+        bottomAction->setChecked(area == Qt::BottomDockWidgetArea);
+    }
 
     if (areaActions->isEnabled()) {
         leftAction->setEnabled(areas & Qt::LeftDockWidgetArea);