Merge remote-tracking branch 'origin/tqtc/lts-6.2.8' into tqtc/lts-6.2-opensource

Conflicts solved in a file:
	dependencies.yaml

Change-Id: I73e756e464858a56908f78ead09fad2c5492a877

7 files changed, 70 insertions, 59 deletions

diff --git a/.cmake.conf b/.cmake.conf
index 07d90b8a..e62fae5e 100644
--- a/.cmake.conf
+++ b/.cmake.conf
@@ -1,2 +1,2 @@
-set(QT_REPO_MODULE_VERSION "6.2.7")
+set(QT_REPO_MODULE_VERSION "6.2.8")
 set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "")
diff --git a/.qmake.conf b/.qmake.conf
index 24e796fe..a0cf48b9 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -2,4 +2,4 @@ load(qt_build_config)
 
 DEFINES += QT_NO_FOREACH QT_NO_JAVA_STYLE_ITERATORS
 
-MODULE_VERSION = 6.2.7
+MODULE_VERSION = 6.2.8
diff --git a/dependencies.yaml b/dependencies.yaml
index 2f2f6413..7c7e151c 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -1,13 +1,13 @@
 dependencies:
   ../tqtc-qtbase:
-    ref: 694575a59b5370afc494fbf700eee8db1d1ec091
+    ref: 67934c103800bae50c2ec1977758d40fa8e4e507
     required: true
   ../tqtc-qtdeclarative:
-    ref: 02277e3753613d9e19bbb36367c7d2b1d13d7545
+    ref: 302ab20d46280e11042f3896460c55d8b8146e41
     required: true
   ../tqtc-qtmultimedia:
-    ref: 7d7a5a372afd1e1c9f6407f8fd90b5ee56723367
+    ref: 644e97ff4a0115e9df2579a10367c2649892741f
     required: false
   ../tqtc-qtsvg:
-    ref: 42fb62219b3d41481f4065d222f227614f41fbe8
+    ref: 40235be466095382836e9b544dc921077c47b417
     required: true
diff --git a/src/virtualkeyboard/content/components/ShadowInputControl.qml b/src/virtualkeyboard/content/components/ShadowInputControl.qml
index 1667f24a..d588a08a 100644
--- a/src/virtualkeyboard/content/components/ShadowInputControl.qml
+++ b/src/virtualkeyboard/content/components/ShadowInputControl.qml
@@ -94,7 +94,8 @@ Item {
                     onCursorPositionChanged: {
                         cursorSyncTimer.restart()
                         blinkStatus = true
-                        cursorTimer.restart()
+                        if (cursorTimer.running)
+                            cursorTimer.restart()
                     }
                     onSelectionStartChanged: cursorSyncTimer.restart()
                     onSelectionEndChanged: cursorSyncTimer.restart()
@@ -123,7 +124,7 @@ Item {
                         id: cursorTimer
                         interval: Qt.styleHints.cursorFlashTime / 2
                         repeat: true
-                        running: true
+                        running: control.visible
                         onTriggered: shadowInput.blinkStatus = !shadowInput.blinkStatus
                     }
                 }
diff --git a/src/virtualkeyboard/doc/src/qtvirtualkeyboard-index.qdoc b/src/virtualkeyboard/doc/src/qtvirtualkeyboard-index.qdoc
index 09bddb95..00a52ece 100644
--- a/src/virtualkeyboard/doc/src/qtvirtualkeyboard-index.qdoc
+++ b/src/virtualkeyboard/doc/src/qtvirtualkeyboard-index.qdoc
@@ -37,74 +37,50 @@
     integrate 3rd party input engines. The input methods can be implemented
     in C++ or QML.
 
-    \section1 Features
+    \section1 Using the Module
 
-    Key features of the Qt Virtual Keyboard include:
+    \include {module-use.qdocinc} {using the c++ api}
 
-    \list
-        \li Customizable keyboard layouts and styles with dynamic switching.
-        \li Predictive text input with word selection.
-        \li Character preview and alternative character view.
-        \li Automatic capitalization and space insertion.
-        \li Scalability to different resolutions.
-        \li Support for different character sets (Latin, Simplified/Traditional Chinese,
-            Hindi, Japanese, Arabic, Hebrew, Korean, and others).
-        \li Support for most common input \l {Supported Languages}{languages},
-            with possibility to easily extend the language support.
-        \li Left-to-right and right-to-left input.
-        \li Hardware key support for 2-way and 5-way navigation.
-        \li \l {Handwriting Recognition}{Handwriting support}, with gestures for fullscreen input.
-        \li Audio feedback.
-        \li Cross-platform functionality.
-        \li Supports both \l {Integration Method}{Qt Quick and Qt Widgets applications}.
-    \endlist
-
-    \section1 Supported Languages
-
-    \include layouts.qdocinc layout-list
+    \section2 Building with CMake
 
-    \section1 Third-party Plugins
+    \include {module-use.qdocinc} {building with cmake} {VirtualKeyboard}
 
-    The Qt Virtual Keyboard supports third-party plugins from the following vendors:
-    \list
-        \li \l {Cerence XT9 Advanced Input}{Cerence XT9} advanced input.
-        \li \l {Handwriting Recognition#Cerence Handwriting}{Cerence Handwriting} text input.
-        \li \l {Handwriting Recognition#MyScript}{MyScript} Text handwriting recognition
-    \endlist
+    \section2 Building with qmake
 
-    \l {Building Qt Virtual Keyboard} describes how to integrate these plugins
-    into the Qt Virtual Keyboard.
+    \include {module-use.qdocinc} {building_with_qmake} {virtualkeyboard}
 
-    \section1 Guides
+    \section1 Articles and Guides
 
     \list
     \li \l {Building Qt Virtual Keyboard}
     \li \l {Deployment Guide}
-    \li \l {Technical Guide}
+    \li \l {Qt Virtual Keyboard Overview}
     \li \l {User Guide}
     \endlist
 
-    \section1 API Reference
+    \section1 Examples
+
+    \list
+      \li \l{Qt Virtual Keyboard Examples}
+    \endlist
+
+    \section1 Reference
 
     \list
         \li \l{Qt Virtual Keyboard QML Types}{QML Types}
         \li \l{Qt Virtual Keyboard C++ Classes}{C++ Classes}
     \endlist
 
-    \section1 Examples
-
-     \list
-      \li \l{Qt Virtual Keyboard Examples}
-     \endlist
 
     \section1 Licenses and Attributions
 
-    Qt Virtual Keyboard is available under commercial licenses from \l{The Qt Company}.
-    In addition, it is available under the \l{GNU General Public License, version 3}.
+    Qt Virtual Keyboard is available under commercial licenses from
+    \l{The Qt Company}. In addition, it is available under the
+    \l{GNU General Public License, version 3}.
     See \l{Qt Licensing} for further details.
 
-    Furthermore Qt Virtual Keyboard potentially contains third party
-    modules under following permissive licenses:
+    Furthermore, Qt Virtual Keyboard potentially contains third party
+    modules under the following permissive licenses:
 
     \generatelist{groupsbymodule attributions-qtvirtualkeyboard}
 */
diff --git a/src/virtualkeyboard/doc/src/technical-guide.qdoc b/src/virtualkeyboard/doc/src/technical-guide.qdoc
index e5f6f72a..d7e4bbf3 100644
--- a/src/virtualkeyboard/doc/src/technical-guide.qdoc
+++ b/src/virtualkeyboard/doc/src/technical-guide.qdoc
@@ -27,17 +27,53 @@
 
 /*!
 
-\page technical-guide.html
+\page qtvirtualkeyboard-overview.html
+\title Qt Virtual Keyboard Overview
+\brief Describes the technical details of the Qt Virtual Keyboard module.
 
-\title Technical Guide
+This document provides a technical overview of the Qt Virtual Keyboard plugin.
 
-\section1 Overview
+\section1 Features
 
-This document provides a technical overview of the Qt Virtual Keyboard plugin.
+Key features of the Qt Virtual Keyboard include:
+
+\list
+    \li Customizable keyboard layouts and styles with dynamic switching.
+    \li Predictive text input with word selection.
+    \li Character preview and alternative character view.
+    \li Automatic capitalization and space insertion.
+    \li Scalability to different resolutions.
+    \li Support for different character sets (Latin, Simplified/Traditional Chinese,
+        Hindi, Japanese, Arabic, Hebrew, Korean, and others).
+    \li Support for most common input \l {Supported Languages}{languages},
+        with possibility to easily extend the language support.
+    \li Left-to-right and right-to-left input.
+    \li Hardware key support for 2-way and 5-way navigation.
+    \li \l {Handwriting Recognition}{Handwriting support}, with gestures for fullscreen input.
+    \li Audio feedback.
+    \li Cross-platform functionality.
+    \li Supports both \l {Integration Method}{Qt Quick and Qt Widgets applications}.
+\endlist
+
+\section1 Supported Languages
+
+\include layouts.qdocinc layout-list
+
+\section1 Third-party Plugins
+
+The Qt Virtual Keyboard supports third-party plugins from the following vendors:
+\list
+    \li \l {Cerence XT9 Advanced Input}{Cerence XT9} advanced input.
+    \li \l {Handwriting Recognition#Cerence Handwriting}{Cerence Handwriting} text input.
+    \li \l {Handwriting Recognition#MyScript}{MyScript} Text handwriting recognition
+\endlist
+
+\l {Building Qt Virtual Keyboard} describes how to integrate these plugins
+into the Qt Virtual Keyboard.
 
 \section1 Basic Concepts
 
-The Qt Virtual Keyboard project is a Qt input context plugin which implements
+The Qt Virtual Keyboard project is a Qt input context plugin that implements
 QPlatformInputContextPlugin and QPlatformInputContext interfaces.
 These interfaces allow the plugin to be used as a platform input
 context plugin in Qt applications.
diff --git a/src/virtualkeyboard/doc/src/user-guide.qdoc b/src/virtualkeyboard/doc/src/user-guide.qdoc
index 8a296a70..f196191a 100644
--- a/src/virtualkeyboard/doc/src/user-guide.qdoc
+++ b/src/virtualkeyboard/doc/src/user-guide.qdoc
@@ -31,8 +31,6 @@
 
 \title User Guide
 
-\section1 Overview
-
 This document explains how to interact with the virtual keyboard.
 
 \section1 Opening the Keyboard