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

Change-Id: Id20053d261b4fbbcc0ac8ba49dd3ef2253fa4b95

3 files changed, 17 insertions, 13 deletions

diff --git a/src/plugins/platforms/ios/qiosinputcontext.h b/src/plugins/platforms/ios/qiosinputcontext.h
index d2a9c261ba..b4ff695f1a 100644
--- a/src/plugins/platforms/ios/qiosinputcontext.h
+++ b/src/plugins/platforms/ios/qiosinputcontext.h
@@ -63,25 +63,27 @@ public:
     QIOSInputContext();
     ~QIOSInputContext();
 
-    QRectF keyboardRect() const;
+    bool isValid() const Q_DECL_OVERRIDE { return true; }
 
-    void showInputPanel();
-    void hideInputPanel();
+    void showInputPanel() Q_DECL_OVERRIDE;
+    void hideInputPanel() Q_DECL_OVERRIDE;
 
-    void clearCurrentFocusObject();
+    bool isInputPanelVisible() const Q_DECL_OVERRIDE;
+    QRectF keyboardRect() const Q_DECL_OVERRIDE;
+
+    void update(Qt::InputMethodQueries) Q_DECL_OVERRIDE;
+    void reset() Q_DECL_OVERRIDE;
+    void commit() Q_DECL_OVERRIDE;
 
-    bool isInputPanelVisible() const;
-    void setFocusObject(QObject *object);
+    void clearCurrentFocusObject();
 
+    void setFocusObject(QObject *object) Q_DECL_OVERRIDE;
     void focusWindowChanged(QWindow *focusWindow);
     void cursorRectangleChanged();
+
     void scrollToCursor();
     void scroll(int y);
 
-    void update(Qt::InputMethodQueries);
-    void reset();
-    void commit();
-
     const ImeState &imeState() { return m_imeState; };
     bool inputMethodAccepted() const;
 
diff --git a/src/plugins/platforms/ios/qioswindow.h b/src/plugins/platforms/ios/qioswindow.h
index 65b4f6dd7d..21a05a302e 100644
--- a/src/plugins/platforms/ios/qioswindow.h
+++ b/src/plugins/platforms/ios/qioswindow.h
@@ -63,6 +63,7 @@ public:
     void setOpacity(qreal level) Q_DECL_OVERRIDE;
 
     bool isExposed() const Q_DECL_OVERRIDE;
+    void propagateSizeHints() Q_DECL_OVERRIDE {}
 
     void raise() { raiseOrLower(true); }
     void lower() { raiseOrLower(false); }
diff --git a/src/plugins/platforms/ios/qioswindow.mm b/src/plugins/platforms/ios/qioswindow.mm
index b0c5f15306..480062e4de 100644
--- a/src/plugins/platforms/ios/qioswindow.mm
+++ b/src/plugins/platforms/ios/qioswindow.mm
@@ -145,9 +145,10 @@ void QIOSWindow::setVisible(bool visible)
 bool QIOSWindow::shouldAutoActivateWindow() const
 {
     // We don't want to do automatic window activation for popup windows
-    // (including Tool, ToolTip and SplashScreen windows), unless they
-    // are standalone (no parent/transient parent), and hence not active.
-    return !(window()->type() & Qt::Popup) || !window()->isActive();
+    // that are unlikely to contain editable controls (to avoid hiding
+    // the keyboard while the popup is showing)
+    const Qt::WindowType type = window()->type();
+    return (type != Qt::Popup && type != Qt::ToolTip) || !window()->isActive();
 }
 
 void QIOSWindow::setOpacity(qreal level)