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

Conflicts:
	src/virtualkeyboard/doc/qtvirtualkeyboard.qdocconf

Change-Id: I2aac70f4bf65794c73096ec575c9f72bc63ec61c

1 files changed, 8 insertions, 4 deletions

diff --git a/src/virtualkeyboard/shifthandler.cpp b/src/virtualkeyboard/shifthandler.cpp
index cdb6baa9..d6252fa9 100644
--- a/src/virtualkeyboard/shifthandler.cpp
+++ b/src/virtualkeyboard/shifthandler.cpp
@@ -74,8 +74,10 @@ public:
 
 /*!
     \class QtVirtualKeyboard::ShiftHandler
-    \inmodule InputFramework
+    \inmodule QtVirtualKeyboard
     \brief Manages the shift state.
+
+    \internal
 */
 
 ShiftHandler::ShiftHandler(InputContext *parent) :
@@ -199,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();
     }
 }
 
@@ -235,7 +240,6 @@ void ShiftHandler::autoCapitalize()
 void ShiftHandler::restart()
 {
     reset();
-    autoCapitalize();
 }
 
 void ShiftHandler::shiftChanged()