From 1e073078a57c4ec83d111a11a240304af056d940 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Wed, 12 Oct 2016 16:04:24 +0200 Subject: Doc: Use standard documentation structure for the module MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Link to separate QML types and C++ classes topics from front page (instead of listing the types there) - Turn the \page topic that lists all QML types into the \qmlmodule topic for the module - Add a \module topic to list C++ classes - Add \ingroup, \title, and \brief commands to \qmlmodule topics to display the docs correctly in tables - Add standard content to \qmlmodule topics - Remove unused \qmlmodule topics - Fix \inmodule commands as necessary Change-Id: I6f6538264fff2ad38994114a2fed7212495a18c2 Reviewed-by: Jarkko Koivikko Reviewed-by: Topi Reiniö --- src/virtualkeyboard/shifthandler.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/virtualkeyboard/shifthandler.cpp') diff --git a/src/virtualkeyboard/shifthandler.cpp b/src/virtualkeyboard/shifthandler.cpp index cdb6baa9..6d5d1220 100644 --- a/src/virtualkeyboard/shifthandler.cpp +++ b/src/virtualkeyboard/shifthandler.cpp @@ -74,7 +74,7 @@ public: /*! \class QtVirtualKeyboard::ShiftHandler - \inmodule InputFramework + \inmodule QtVirtualKeyboard \brief Manages the shift state. */ -- cgit v1.2.3 From bffc2e5796ed4ebdcf2db4884b1f14b563b371b1 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Fri, 14 Oct 2016 10:08:06 +0200 Subject: Doc: Mark the remaining C++ API \internal MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Hide the C++ classes entry from the help file (.qdocconf) - Remove link to the C++ classes from the module front page - Mark classes and namespace \internal - Mark the C++ module page \internal Change-Id: I07b04af84b45d048c5cbb133bd5d70f8b38f25dd Reviewed-by: Topi Reiniö --- src/virtualkeyboard/shifthandler.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/virtualkeyboard/shifthandler.cpp') diff --git a/src/virtualkeyboard/shifthandler.cpp b/src/virtualkeyboard/shifthandler.cpp index 6d5d1220..4c9f498b 100644 --- a/src/virtualkeyboard/shifthandler.cpp +++ b/src/virtualkeyboard/shifthandler.cpp @@ -76,6 +76,8 @@ public: \class QtVirtualKeyboard::ShiftHandler \inmodule QtVirtualKeyboard \brief Manages the shift state. + + \internal */ ShiftHandler::ShiftHandler(InputContext *parent) : -- cgit v1.2.3 From 98aa04821f6b851a990f3fc0e1ac29291d28de14 Mon Sep 17 00:00:00 2001 From: Jarkko Koivikko Date: Sat, 12 Nov 2016 22:00:48 +0200 Subject: Fix duplicate shift state change when focus object changes Previously the shift state could be set twice when focus object changed, first in reset() method and then in autoCapitalize() method. This change eliminates the initial shift state in reset() method. Task-number: QTBUG-57082 Change-Id: I4bba5c85aae1d0d631e7e30577d0d4068c9cc582 Reviewed-by: Mitch Curtis --- src/virtualkeyboard/shifthandler.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/virtualkeyboard/shifthandler.cpp') diff --git a/src/virtualkeyboard/shifthandler.cpp b/src/virtualkeyboard/shifthandler.cpp index 69735665..22302129 100644 --- a/src/virtualkeyboard/shifthandler.cpp +++ b/src/virtualkeyboard/shifthandler.cpp @@ -191,10 +191,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(); } } @@ -227,7 +230,6 @@ void ShiftHandler::autoCapitalize() void ShiftHandler::restart() { reset(); - autoCapitalize(); } void ShiftHandler::shiftChanged() -- cgit v1.2.3