aboutsummaryrefslogtreecommitdiffstats
path: root/src/virtualkeyboard/doc/src
diff options
context:
space:
mode:
Diffstat (limited to 'src/virtualkeyboard/doc/src')
-rw-r--r--src/virtualkeyboard/doc/src/build.qdoc2
-rw-r--r--src/virtualkeyboard/doc/src/qtvirtualkeyboard-index.qdoc12
-rw-r--r--src/virtualkeyboard/doc/src/technical-guide.qdoc8
3 files changed, 17 insertions, 5 deletions
diff --git a/src/virtualkeyboard/doc/src/build.qdoc b/src/virtualkeyboard/doc/src/build.qdoc
index 21b0eb2b..1e75ef32 100644
--- a/src/virtualkeyboard/doc/src/build.qdoc
+++ b/src/virtualkeyboard/doc/src/build.qdoc
@@ -181,7 +181,7 @@ the preferred input method to the configuration, e.g., \c CONFIG+="lang-zh_TW zh
\row
\li \e static
\li Enables static builds of the virtual keyboard
- \li This option enables \l {Static build}{static builds}.
+ \li This option enables \l {Static builds}{static builds}.
\row
\li \e retro-style
\li \e n/a
diff --git a/src/virtualkeyboard/doc/src/qtvirtualkeyboard-index.qdoc b/src/virtualkeyboard/doc/src/qtvirtualkeyboard-index.qdoc
index 92ff3541..94339df7 100644
--- a/src/virtualkeyboard/doc/src/qtvirtualkeyboard-index.qdoc
+++ b/src/virtualkeyboard/doc/src/qtvirtualkeyboard-index.qdoc
@@ -79,6 +79,7 @@
\li Persian/Farsi
\li Polish
\li Portugese
+ \li Romanian
\li Russian
\li Simplified Chinese
\li Traditional Chinese
@@ -109,6 +110,17 @@
\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}.
+ See \l{Qt Licensing} for further details.
+
+ Furthermore Qt Virtual Keyboard potentially contains third party
+ modules under 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 4832bdc1..7e279bcd 100644
--- a/src/virtualkeyboard/doc/src/technical-guide.qdoc
+++ b/src/virtualkeyboard/doc/src/technical-guide.qdoc
@@ -56,7 +56,6 @@ The input framework provides the following main interfaces:
\li InputEngine: exposes an API to integrate user input events (key
presses, etc.) and acts as a host for input methods.
\li InputMethod: a base type for QML based input methods.
- \li \l {QtVirtualKeyboard::AbstractInputMethod} {AbstractInputMethod}: a base type for C++ based input methods.
\endlist
\section1 The Input Context
@@ -140,8 +139,7 @@ key can be interrupted by using the InputEngine::virtualKeyCancel method.
Activating an input method is straightforward. The required steps are:
\list
- \li Instantiate a concrete implementation of InputMethod or
- \l {QtVirtualKeyboard::AbstractInputMethod} {AbstractInputMethod}
+ \li Instantiate a concrete implementation of InputMethod
\li Assign the instance to InputEngine::inputMethod
\li Set the proper input mode with InputEngine::inputMode
\endlist
@@ -579,7 +577,9 @@ style name, the virtual keyboard falls back in the default built-in style.
\section2 Adding Custom Styles
The process of creating a new style begins by creating a new subdirectory
-for the style in the virtual keyboard \e Styles directory. The directory
+for the style in a QML import path under the URL-based directory structure
+QtQuick/VirtualKeyboard/Styles/. See \l {QML Import Path}
+for information about QML import paths. The directory
name can not contain spaces or special characters other than underscore.
Also, the directory name can not be the same as one of the built-in style,
which currently includes "default" and "retro".