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

Conflicts:
	src/virtualkeyboard/content/InputPanel.qml

Change-Id: I6839198e123f682a88132f8efbed0bdaf8835e7e

2 files changed, 9 insertions, 5 deletions

diff --git a/src/virtualkeyboard/content/InputPanel.qml b/src/virtualkeyboard/content/InputPanel.qml
index 1ac2eb86..2e500a1b 100644
--- a/src/virtualkeyboard/content/InputPanel.qml
+++ b/src/virtualkeyboard/content/InputPanel.qml
@@ -46,11 +46,13 @@ import QtQuick.VirtualKeyboard 2.1
 Item {
     id: inputPanel
 
-    /*! \qmlproperty bool Active state of the input panel
+    /*!
+        \qmlproperty bool InputPanel::active
         \since QtQuick.VirtualKeyboard 2.0
 
         This property reflects the active status of the input panel.
-        The keyboard should be made visible to user when the active is true.
+        The keyboard should be made visible to the user when this property is
+        \c true.
     */
     property alias active: keyboard.active
 
diff --git a/src/virtualkeyboard/shifthandler.cpp b/src/virtualkeyboard/shifthandler.cpp
index 4c9f498b..d6252fa9 100644
--- a/src/virtualkeyboard/shifthandler.cpp
+++ b/src/virtualkeyboard/shifthandler.cpp
@@ -201,10 +201,13 @@ void ShiftHandler::reset()
             autoCapitalizationEnabled = false;
             toggleShiftEnabled = false;
         }
-        d->inputContext->setShift(preferUpperCase);
-        d->inputContext->setCapsLock(preferUpperCase);
         setToggleShiftEnabled(toggleShiftEnabled);
         setAutoCapitalizationEnabled(autoCapitalizationEnabled);
+        d->inputContext->setCapsLock(preferUpperCase);
+        if (preferUpperCase)
+            d->inputContext->setShift(preferUpperCase);
+        else
+            autoCapitalize();
     }
 }
 
@@ -237,7 +240,6 @@ void ShiftHandler::autoCapitalize()
 void ShiftHandler::restart()
 {
     reset();
-    autoCapitalize();
 }
 
 void ShiftHandler::shiftChanged()