diff options
| author | Rainer Keller <rainer.keller@digia.com> | 2014-05-13 08:51:52 +0200 |
|---|---|---|
| committer | Rainer Keller <rainer.keller@digia.com> | 2014-05-13 13:09:53 +0300 |
| commit | 929a87255d3e92a3b49299104d53f041c1d4f5a3 (patch) | |
| tree | b3fee2f3c3954ea7ff888b3aa18dc4785eeb7338 /basicsuite/textinput/TextBase.qml | |
| parent | 970e4ef386ea26dd9f475ae17d51aff98970308d (diff) | |
Change text input demo to match virtual keyboard 1.0 API
Change-Id: I331138272037cd627e74cbcb7fd5cca99e019fb6
Reviewed-by: Kalle Viironen <kalle.viironen@digia.com>
Diffstat (limited to 'basicsuite/textinput/TextBase.qml')
| -rw-r--r-- | basicsuite/textinput/TextBase.qml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/basicsuite/textinput/TextBase.qml b/basicsuite/textinput/TextBase.qml index 916b3e2..fc399a8 100644 --- a/basicsuite/textinput/TextBase.qml +++ b/basicsuite/textinput/TextBase.qml @@ -40,6 +40,7 @@ ****************************************************************************/ import QtQuick 2.0 +import QtQuick.Enterprise.VirtualKeyboard 1.0 FocusScope { id: textBase @@ -48,8 +49,9 @@ FocusScope { property bool previewTextActive: !editor.activeFocus && text.length === 0 property int fontPixelSize: 32 property string previewText + property int enterKeyAction: EnterKeyAction.None property string enterKeyText - property bool enterKeyEnabled: enterKeyText.length === 0 || editor.text.length > 0 || editor.inputMethodComposing + property bool enterKeyEnabled: enterKeyAction === EnterKeyAction.None || editor.text.length > 0 || editor.inputMethodComposing property alias mouseParent: mouseArea.parent implicitHeight: editor.height + 12 |