diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2018-02-01 11:11:39 +0100 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@qt.io> | 2018-03-06 09:43:45 +0000 |
| commit | 5e10b7c58b6c252661a7b3097acff13413a6a2aa (patch) | |
| tree | c263193404eebca0c761ac1e555d5c278e96fde3 /src | |
| parent | 7db26902b36e3417a96586f98278b63afc0b0ad4 (diff) | |
Use Qt Quick Controls 2 in the basic example
- Replace custom text input types with corresponding
Qt Quick Controls 2 types.
- Replace custom scrollbar with ScrollBar from Qt Quick Controls 2.
- Only build the basic example if Qt Quick Controls 2 is available.
- Update the documentation and its screenshot.
Change-Id: Ib2559595d4a589bb228450bc08be5ab6fbc69b91
Reviewed-by: Jarkko Koivikko <jarkko.koivikko@code-q.fi>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/virtualkeyboard/doc/images/basic-example.png | bin | 34147 -> 73322 bytes | |||
| -rw-r--r-- | src/virtualkeyboard/doc/src/qtvirtualkeyboard-examples.qdoc | 12 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/virtualkeyboard/doc/images/basic-example.png b/src/virtualkeyboard/doc/images/basic-example.png Binary files differindex 7401c168..6f46bb30 100644 --- a/src/virtualkeyboard/doc/images/basic-example.png +++ b/src/virtualkeyboard/doc/images/basic-example.png diff --git a/src/virtualkeyboard/doc/src/qtvirtualkeyboard-examples.qdoc b/src/virtualkeyboard/doc/src/qtvirtualkeyboard-examples.qdoc index ef2bf69f..2313ce41 100644 --- a/src/virtualkeyboard/doc/src/qtvirtualkeyboard-examples.qdoc +++ b/src/virtualkeyboard/doc/src/qtvirtualkeyboard-examples.qdoc @@ -40,8 +40,8 @@ \ingroup qtvirtualkeyboard-examples \image basic-example.png - The example has two implementations: one for the desktop - platforms and another for the embedded platforms. The former version + The example has two implementations: one for desktop + platforms and another for embedded platforms. The former version enables text input into several text fields using the virtual keyboard, whereas the latter version uses the same UI but with a custom virtual keyboard InputPanel. The following snippet from @@ -74,10 +74,10 @@ \skipto /^\}$/ \printuntil } - The TextField and TextArea are inherited from the TextBase custom type, - which has \c enterKeyEnabled, \c enterKeyText, and \c enterKeyAction - properties. The TextField and TextArea instances in the snippet can - set these properties to change the default behavior. + The TextField and TextArea controls extend the respective + \l {Qt Quick Controls 2} types with \c enterKeyEnabled and + \c enterKeyAction properties. The TextField and TextArea instances in the + snippet can set these properties to change the default behavior. \include examples-run.qdocinc */ |
