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

3 files changed, 8 insertions, 5 deletions

diff --git a/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro b/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro
index 99c32ea672..4fd0823332 100644
--- a/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro
+++ b/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro
@@ -23,7 +23,10 @@ win32: DEFINES += HB_NO_WIN1256
 android: DEFINES += _POSIX_C_SOURCE=200112L
 
 INCLUDEPATH += $$PWD/include
+
+# Harfbuzz-NG inside Qt uses the Qt atomics (inline code only)
 INCLUDEPATH += $$QT.core.includes
+DEFINES += QT_NO_VERSION_TAGGING
 
 SOURCES += \
     $$PWD/src/hb-blob.cc \
diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-arabic.c b/src/3rdparty/harfbuzz/src/harfbuzz-arabic.c
index b43ac9c353..966537ffa0 100644
--- a/src/3rdparty/harfbuzz/src/harfbuzz-arabic.c
+++ b/src/3rdparty/harfbuzz/src/harfbuzz-arabic.c
@@ -921,7 +921,7 @@ static void shapedString(const HB_UChar16 *uc, hb_uint32 stringLength, hb_uint32
 
     for (i = 0; i < len; i++) {
         hb_uint8 r = *ch >> 8;
-        int gpos = data - shapeBuffer;
+        const int gpos = int(data - shapeBuffer);
 
         if (r != 0x06) {
             if (r == 0x20) {
@@ -981,7 +981,7 @@ static void shapedString(const HB_UChar16 *uc, hb_uint32 stringLength, hb_uint32
 /*             qDebug("glyph %d (char %d) is mark!", gpos, i); */
         } else {
             attributes[gpos].mark = FALSE;
-            clusterStart = data - shapeBuffer;
+            clusterStart = int(data - shapeBuffer);
         }
         attributes[gpos].clusterStart = !attributes[gpos].mark;
         attributes[gpos].combiningClass = HB_GetUnicodeCharCombiningClass(*ch);
@@ -992,7 +992,7 @@ static void shapedString(const HB_UChar16 *uc, hb_uint32 stringLength, hb_uint32
         ch++;
         logClusters[i] = clusterStart;
     }
-    *shapedLength = data - shapeBuffer;
+    *shapedLength = int(data - shapeBuffer);
 
     HB_FREE_STACKARRAY(props);
 }
diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-shaper.cpp b/src/3rdparty/harfbuzz/src/harfbuzz-shaper.cpp
index f7a4195308..30dde281e8 100644
--- a/src/3rdparty/harfbuzz/src/harfbuzz-shaper.cpp
+++ b/src/3rdparty/harfbuzz/src/harfbuzz-shaper.cpp
@@ -94,7 +94,7 @@ static inline void positionCluster(HB_ShaperItem *item, int gfrom,  int glast)
                 offsetBase = ((size * 10) - markTotalHeight) / 2; // Use offset that just fits
         }
 
-    bool rightToLeft = item->item.bidiLevel % 2;
+    const bool rightToLeft = (item->item.bidiLevel % 2) != 0;
 
     int i;
     unsigned char lastCmb = 0;
@@ -281,7 +281,7 @@ void HB_HeuristicSetGlyphAttributes(HB_ShaperItem *item)
 
     // first char in a run is never (treated as) a mark
     int cStart = 0;
-    const bool symbolFont = item->face->isSymbolFont;
+    const bool symbolFont = item->face->isSymbolFont != 0;
     attributes[0].mark = false;
     attributes[0].clusterStart = true;
     attributes[0].dontPrint = (!symbolFont && uc[0] == 0x00ad) || HB_IsControlChar(uc[0]);