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

Conflicts:
	configure
5.7 now supports clang on android; but dev re-worked configure

	src/gui/kernel/qevent.h
One side renamed a parameter of a constructor; the other added an
alternate constructor on the next line.  Applied the rename to both
for consistency.

	tests/auto/tools/moc/tst_moc.cpp
Each side added a new test at the end.

	.qmake.conf
Ignored 5.7's change to MODULE_VERSION.

	configure.json
No conflict noticed by git; but changes in 5.7 were needed for the
re-worked configure to accommodate 5.7's stricter handling of C++11.

Change-Id: I9cda53836a32d7bf83828212c7ea00b1de3e09d2

1 files changed, 17 insertions, 14 deletions

diff --git a/examples/widgets/mainwindows/mainwindow/colorswatch.cpp b/examples/widgets/mainwindows/mainwindow/colorswatch.cpp
index c472df966c..c47b80275f 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);