diff options
author | Liang Qi <liang.qi@qt.io> | 2016-11-25 16:06:52 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-11-25 16:06:52 +0100 |
commit | e67e97e9543eae2de42666eec3ff4d3cdca81db3 (patch) | |
tree | dabfba5605c8aa99ad2b548f0ad95b02d4569cac /src/virtualkeyboard/shifthandler.cpp | |
parent | 1ba0613309439f778b4b4e955131d80936490371 (diff) | |
parent | ea873857fd7c92608bfa64d080dbdf9589ffa4b3 (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/virtualkeyboard/content/InputPanel.qml
Change-Id: I6839198e123f682a88132f8efbed0bdaf8835e7e
Diffstat (limited to 'src/virtualkeyboard/shifthandler.cpp')
-rw-r--r-- | src/virtualkeyboard/shifthandler.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
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() |