summaryrefslogtreecommitdiffstats
path: root/basicsuite/textinput/TextArea.qml
diff options
context:
space:
mode:
authorRainer Keller <rainer.keller@digia.com>2014-05-13 08:51:52 +0200
committerRainer Keller <rainer.keller@digia.com>2014-05-13 13:09:53 +0300
commit929a87255d3e92a3b49299104d53f041c1d4f5a3 (patch)
treeb3fee2f3c3954ea7ff888b3aa18dc4785eeb7338 /basicsuite/textinput/TextArea.qml
parent970e4ef386ea26dd9f475ae17d51aff98970308d (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/TextArea.qml')
-rw-r--r--basicsuite/textinput/TextArea.qml7
1 files changed, 4 insertions, 3 deletions
diff --git a/basicsuite/textinput/TextArea.qml b/basicsuite/textinput/TextArea.qml
index 6832356..89cdc9f 100644
--- a/basicsuite/textinput/TextArea.qml
+++ b/basicsuite/textinput/TextArea.qml
@@ -40,6 +40,7 @@
****************************************************************************/
import QtQuick 2.0
+import QtQuick.Enterprise.VirtualKeyboard 1.0
TextBase {
id: textArea
@@ -64,8 +65,9 @@ TextBase {
TextEdit {
id: textEdit
- property alias enterKeyText: textArea.enterKeyText
- property alias enterKeyEnabled: textArea.enterKeyEnabled
+ EnterKeyAction.actionId: textArea.enterKeyAction
+ EnterKeyAction.label: textArea.enterKeyText
+ EnterKeyAction.enabled: textArea.enterKeyEnabled
y: 6
focus: true
@@ -77,7 +79,6 @@ TextBase {
selectionColor: Qt.rgba(1.0, 1.0, 1.0, 0.5)
selectedTextColor: Qt.rgba(0.0, 0.0, 0.0, 0.8)
anchors { left: parent.left; right: parent.right; margins: 12 }
-
onActiveFocusChanged: if (!activeFocus) deselect()
}
}