diff options
| author | Samuli Piippo <samuli.piippo@digia.com> | 2014-09-02 10:23:39 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@digia.com> | 2014-09-02 10:24:26 +0300 |
| commit | 406db8fabcf8de5ab31880ca579edb7004cc4f4e (patch) | |
| tree | 6b349020fef1d2f8f601a509d7c259fa40bea0f9 /basicsuite/textinput/TextArea.qml | |
| parent | 2aab20bb2c32aadba2bef16828e3dd0f6c29a30b (diff) | |
| parent | ad9ea42d493bc9b125c019373fa5fe84cfcc225d (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
* origin/stable: (63 commits)
Doc: Bump version to 3.1.1
Make FPS checkbox persistent
Handle accelerometer readings in rotated items
webengine: Add slight delay before loading the start page
webengine: disable the webgl demo
Update screenshot of the Virtual Keyboard demo
[Doc] Use symbolic links for demo preview images
Changed the audio track on the Qt_EnterpriseEmbedded_1080p.mp4 video.
Fix demo descriptions.
launchersettings: make ip field span two columns
Remove deleted demos also from doc
Update all VirtualKeyboard import to version 1.1
Doc: Bump version to 3.1.0
Doc: Content/language improvement for About QtEE demo.
Disable GraphicalEffects demo on beagleboneblack
about: fit text properly to the box
Fix Meet Qt Enterprise Embedded video url on startup
Fix a typo in the new About presentation
About Boot to Qt-demo update
Update Enterprise gallery demo description
...
Change-Id: I928ab65867993c83ae645834430fd15825349fde
Diffstat (limited to 'basicsuite/textinput/TextArea.qml')
| -rw-r--r-- | basicsuite/textinput/TextArea.qml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/basicsuite/textinput/TextArea.qml b/basicsuite/textinput/TextArea.qml index 6832356..cf84689 100644 --- a/basicsuite/textinput/TextArea.qml +++ b/basicsuite/textinput/TextArea.qml @@ -40,6 +40,7 @@ ****************************************************************************/ import QtQuick 2.0 +import QtQuick.Enterprise.VirtualKeyboard 1.1 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() } } |