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

Conflicts:
	.qmake.conf
	sc/corelib/io/qfsfileengine_p.h
	src/corelib/io/qstorageinfo_unix.cpp
	src/platformsupport/eglconvenience/qeglpbuffer_p.h
	src/platformsupport/input/libinput/qlibinputkeyboard.cpp
	src/platformsupport/input/libinput/qlibinputpointer.cpp
	src/plugins/platforms/cocoa/qcocoamenu.mm
	src/plugins/platforms/ios/qiosscreen.h
	src/plugins/platforms/ios/qioswindow.h
	src/plugins/platforms/ios/quiview.mm
	src/printsupport/dialogs/qpagesetupdialog_unix_p.h
	src/printsupport/dialogs/qprintpreviewdialog.cpp
	src/printsupport/widgets/qcupsjobwidget_p.h
	src/widgets/widgets/qmenu.cpp
	tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
	tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp

Change-Id: Iecb4883122efe97ef0ed850271e6c51bab568e9c

1 files changed, 14 insertions, 10 deletions

diff --git a/src/plugins/platforms/ios/qiosinputcontext.mm b/src/plugins/platforms/ios/qiosinputcontext.mm
index 237077400b..050c592aca 100644
--- a/src/plugins/platforms/ios/qiosinputcontext.mm
+++ b/src/plugins/platforms/ios/qiosinputcontext.mm
@@ -500,23 +500,25 @@ void QIOSInputContext::scrollToCursor()
 
     QWindow *focusWindow = qApp->focusWindow();
     QRect cursorRect = qApp->inputMethod()->cursorRectangle().translated(focusWindow->geometry().topLeft()).toRect();
-    if (cursorRect.isNull()) {
-         scroll(0);
-         return;
-    }
-
-     // Add some padding so that the cusor does not end up directly above the keyboard
-    static const int kCursorRectPadding = 20;
-    cursorRect.adjust(0, -kCursorRectPadding, 0, kCursorRectPadding);
 
     // We explicitly ask for the geometry of the screen instead of the availableGeometry,
-    // as we hide the statusbar when scrolling the screen, so the available geometry will
+    // as we hide the status bar when scrolling the screen, so the available geometry will
     // include the space taken by the status bar at the moment.
     QRect screenGeometry = focusWindow->screen()->geometry();
+
+    if (!cursorRect.isNull()) {
+         // Add some padding so that the cursor does not end up directly above the keyboard
+        static const int kCursorRectPadding = 20;
+        cursorRect.adjust(0, -kCursorRectPadding, 0, kCursorRectPadding);
+
+        // Make sure the cursor rect is still within the screen geometry after padding
+        cursorRect &= screenGeometry;
+    }
+
     QRect keyboardGeometry = QRectF::fromCGRect(m_keyboardState.keyboardEndRect).toRect();
     QRect availableGeometry = (QRegion(screenGeometry) - keyboardGeometry).boundingRect();
 
-    if (!availableGeometry.contains(cursorRect, true)) {
+    if (!cursorRect.isNull() && !availableGeometry.contains(cursorRect)) {
         qImDebug() << "cursor rect" << cursorRect << "not fully within" << availableGeometry;
         int scrollToCenter = -(availableGeometry.center() - cursorRect.center()).y();
         int scrollToBottom = focusWindow->screen()->geometry().bottom() - availableGeometry.bottom();
@@ -528,6 +530,8 @@ void QIOSInputContext::scrollToCursor()
 
 void QIOSInputContext::scroll(int y)
 {
+    Q_ASSERT(y >= 0);
+
     UIView *rootView = scrollableRootView();
     if (!rootView)
         return;