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

Also bump minimum required Qt version for Android: Ministro updates.

Conflicts:
	src/android/java/src/org/qtproject/qt5/android/bindings/QtActivityLoader.java
	src/android/java/src/org/qtproject/qt5/android/bindings/QtLoader.java
	src/plugins/platforms/android/androidjnimain.cpp

Change-Id: I966f249bebf92da37bfdeb995ad21b027eb03301

1 files changed, 8 insertions, 0 deletions

diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-shaper.cpp b/src/3rdparty/harfbuzz/src/harfbuzz-shaper.cpp
index 30dde281e8..82977db5e7 100644
--- a/src/3rdparty/harfbuzz/src/harfbuzz-shaper.cpp
+++ b/src/3rdparty/harfbuzz/src/harfbuzz-shaper.cpp
@@ -156,12 +156,14 @@ static inline void positionCluster(HB_ShaperItem *item, int gfrom,  int glast)
                 // ### wrong in rtl context!
         case HB_Combining_BelowLeft:
             p.y += offset;
+            // fall through
         case HB_Combining_BelowLeftAttached:
             p.x += attachmentRect.x - markMetrics.x;
             p.y += (attachmentRect.y + attachmentRect.height) - markMetrics.y;
             break;
         case HB_Combining_Below:
             p.y += offset;
+            // fall through
         case HB_Combining_BelowAttached:
             p.x += attachmentRect.x - markMetrics.x;
             p.y += (attachmentRect.y + attachmentRect.height) - markMetrics.y;
@@ -170,28 +172,33 @@ static inline void positionCluster(HB_ShaperItem *item, int gfrom,  int glast)
             break;
         case HB_Combining_BelowRight:
             p.y += offset;
+            // fall through
         case HB_Combining_BelowRightAttached:
             p.x += attachmentRect.x + attachmentRect.width - markMetrics.width - markMetrics.x;
             p.y += attachmentRect.y + attachmentRect.height - markMetrics.y;
             break;
         case HB_Combining_Left:
             p.x -= offset;
+            // fall through
         case HB_Combining_LeftAttached:
             break;
         case HB_Combining_Right:
             p.x += offset;
+            // fall through
         case HB_Combining_RightAttached:
             break;
         case HB_Combining_DoubleAbove:
             // ### wrong in RTL context!
         case HB_Combining_AboveLeft:
             p.y -= offset;
+            // fall through
         case HB_Combining_AboveLeftAttached:
             p.x += attachmentRect.x - markMetrics.x;
             p.y += attachmentRect.y - markMetrics.y - markMetrics.height;
             break;
         case HB_Combining_Above:
             p.y -= offset;
+            // fall through
         case HB_Combining_AboveAttached:
             p.x += attachmentRect.x - markMetrics.x;
             p.y += attachmentRect.y - markMetrics.y - markMetrics.height;
@@ -200,6 +207,7 @@ static inline void positionCluster(HB_ShaperItem *item, int gfrom,  int glast)
             break;
         case HB_Combining_AboveRight:
             p.y -= offset;
+            // fall through
         case HB_Combining_AboveRightAttached:
             p.x += attachmentRect.x + attachmentRect.width - markMetrics.x - markMetrics.width;
             p.y += attachmentRect.y - markMetrics.y - markMetrics.height;