diff options
author | Kalle Viironen <kalle.viironen@digia.com> | 2014-04-15 15:10:27 +0300 |
---|---|---|
committer | Kalle Viironen <kalle.viironen@digia.com> | 2014-04-15 15:10:38 +0300 |
commit | d757a8ee2d86c3f4b694f8fdff5defa7b0dbab75 (patch) | |
tree | 27b30b37643ebfe4615d7eb645b72cd42a4316cb /basicsuite/textinput/TextBase.qml | |
parent | 80c1335ec02c038329603486315d06d7bddc1326 (diff) | |
parent | 63d998641077d9074281f402ae7becb41c037a2c (diff) |
Merge branch 'stable' into releaseQtEE_v2.1.0
* stable: (21 commits)
Revert "Show PieMenu in enterprise controls list view."
Show PieMenu in enterprise controls list view.
Fix PieMenu not showing in enterprise-gallery launcher demo.
Update enterprise controls demos to version 1.1
Revert "Add input field for decimal numbers"
Doc: Update documentation version to 2.1.0
[launchersettings] Fix UI scaling
[about-b2qt] Use Screen element for setting width/height
Change default font for demos to support arabic numbers
[launchersettings] Small fixes in wifi settings section
sensorexplorer: Use identifier field when description is empty
Make sensors demo not rely on measurement errors
Doc: Update screenshot for the textinput demo
Remove incorrect assingment of QUrl to bool
qt5-everywhere: update working radio playlist
Show launchersettings and sensors demos in QtCreator
Doc: Switch to use the global Qt template for example docs
Updated preview_l.jpg for textinput demo
Rearrange the order of demos in the launcher
Merge updates from upstream into keyboard example
...
Change-Id: I83f65cb50cf53609d9bb131c94c3d020882a2ccd
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 67ee3e3..916b3e2 100644 --- a/basicsuite/textinput/TextBase.qml +++ b/basicsuite/textinput/TextBase.qml @@ -49,7 +49,7 @@ FocusScope { property int fontPixelSize: 32 property string previewText property string enterKeyText - property bool enterKeyEnabled: true + property bool enterKeyEnabled: enterKeyText.length === 0 || editor.text.length > 0 || editor.inputMethodComposing property alias mouseParent: mouseArea.parent implicitHeight: editor.height + 12 @@ -86,6 +86,8 @@ FocusScope { parent: textBase anchors.fill: parent onClicked: { + if (editor.inputMethodComposing) + Qt.inputMethod.commit() var positionInEditor = mapToItem(editor, mouseX, mouseY) var cursorPosition = editor.positionAt(positionInEditor.x, positionInEditor.y) editor.cursorPosition = cursorPosition |