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

 Conflicts:
	src/network/ssl/qsslsocket_openssl.cpp
	src/platformsupport/vkconvenience/qvkconvenience.cpp

Change-Id: I97ce6ed185f7fdad8102cc58d3cfec0119fd7bb4

3 files changed, 48 insertions, 3 deletions

diff --git a/src/plugins/platforms/android/qandroidinputcontext.cpp b/src/plugins/platforms/android/qandroidinputcontext.cpp
index fa07af8c46..5614d3b04f 100644
--- a/src/plugins/platforms/android/qandroidinputcontext.cpp
+++ b/src/plugins/platforms/android/qandroidinputcontext.cpp
@@ -558,6 +558,7 @@ static inline int getBlockPosition(const QSharedPointer<QInputMethodQueryEvent>
 
 void QAndroidInputContext::reset()
 {
+    focusObjectStopComposing();
     clear();
     m_batchEditNestingLevel = 0;
     m_handleMode = Hidden;
@@ -792,7 +793,25 @@ void QAndroidInputContext::touchDown(int x, int y)
         m_handleMode = ShowCursor;
         // The VK will appear in a moment, stop the timer
         m_hideCursorHandleTimer.stop();
-        focusObjectStopComposing();
+
+        if (focusObjectIsComposing()) {
+            const double pixelDensity =
+                    QGuiApplication::focusWindow()
+                    ? QHighDpiScaling::factor(QGuiApplication::focusWindow())
+                    : QHighDpiScaling::factor(QtAndroid::androidPlatformIntegration()->screen());
+
+            const QPointF touchPointLocal =
+                    QGuiApplication::inputMethod()->inputItemTransform().inverted().map(
+                            QPointF(x / pixelDensity, y / pixelDensity));
+
+            const int curBlockPos = getBlockPosition(
+                    focusObjectInputMethodQuery(Qt::ImCursorPosition | Qt::ImAbsolutePosition));
+            const int touchPosition = curBlockPos
+                    + QInputMethod::queryFocusObject(Qt::ImCursorPosition, touchPointLocal).toInt();
+            if (touchPosition != m_composingCursor)
+                focusObjectStopComposing();
+        }
+
         updateSelectionHandles();
     }
 }
@@ -1200,13 +1219,18 @@ jint QAndroidInputContext::getCursorCapsMode(jint /*reqModes*/)
     const uint qtInputMethodHints = query->value(Qt::ImHints).toUInt();
     const int localPos = query->value(Qt::ImCursorPosition).toInt();
 
-    bool atWordBoundary = (localPos == 0);
+    bool atWordBoundary =
+            localPos == 0
+            && (!focusObjectIsComposing() || m_composingCursor == m_composingTextStart);
+
     if (!atWordBoundary) {
         QString surroundingText = query->value(Qt::ImSurroundingText).toString();
         surroundingText.truncate(localPos);
+        if (focusObjectIsComposing())
+            surroundingText += m_composingText.leftRef(m_composingCursor - m_composingTextStart);
         // Add a character to see if it is at the end of the sentence or not
         QTextBoundaryFinder finder(QTextBoundaryFinder::Sentence, surroundingText + QLatin1Char('A'));
-        finder.setPosition(localPos);
+        finder.setPosition(surroundingText.length());
         if (finder.isAtBoundary())
             atWordBoundary = finder.isAtBoundary();
     }
diff --git a/src/plugins/platforms/android/qandroidplatformtheme.cpp b/src/plugins/platforms/android/qandroidplatformtheme.cpp
index a78a62337f..7fc68c3d7c 100644
--- a/src/plugins/platforms/android/qandroidplatformtheme.cpp
+++ b/src/plugins/platforms/android/qandroidplatformtheme.cpp
@@ -489,6 +489,8 @@ QVariant QAndroidPlatformTheme::themeHint(ThemeHint hint) const
 
             Q_FALLTHROUGH();
     }
+    case DialogButtonBoxLayout:
+        return QVariant(QPlatformDialogHelper::AndroidLayout);
     default:
         return QPlatformTheme::themeHint(hint);
     }
diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.mm b/src/plugins/platforms/cocoa/qcocoaintegration.mm
index 300082d694..08e7447a75 100644
--- a/src/plugins/platforms/cocoa/qcocoaintegration.mm
+++ b/src/plugins/platforms/cocoa/qcocoaintegration.mm
@@ -215,6 +215,25 @@ QCocoaIntegration::QCocoaIntegration(const QStringList &paramList)
 
     connect(qGuiApp, &QGuiApplication::focusWindowChanged,
         this, &QCocoaIntegration::focusWindowChanged);
+
+    static auto splashScreenHider = QMacKeyValueObserver(NSApp, @"modalWindow", []{
+        const QWindowList allWindows = QGuiApplication::topLevelWindows();
+        for (QWindow *window : allWindows) {
+            if ((window->flags() & Qt::SplashScreen) == Qt::SplashScreen) {
+                QCocoaWindow *platformWindow = static_cast<QCocoaWindow*>(window->handle());
+                NSWindow *splashWindow = platformWindow->view().window;
+                if (!splashWindow)
+                    continue;
+                if (NSApp.modalWindow) {
+                    NSInteger originalLevel = splashWindow.level;
+                    splashWindow.level = NSNormalWindowLevel;
+                    window->setProperty("_q_levelBeforeModalSession", (qlonglong)originalLevel);
+                } else if (NSInteger originalLevel = window->property("_q_levelBeforeModalSession").toLongLong()) {
+                    splashWindow.level = originalLevel;
+                }
+            }
+        }
+    });
 }
 
 QCocoaIntegration::~QCocoaIntegration()