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

1 files changed, 12 insertions, 2 deletions

diff --git a/basicsuite/textinput/TextField.qml b/basicsuite/textinput/TextField.qml
index e95ded7..f25dc49 100644
--- a/basicsuite/textinput/TextField.qml
+++ b/basicsuite/textinput/TextField.qml
@@ -40,6 +40,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
+import QtQuick.Enterprise.VirtualKeyboard 1.1
 
 TextBase {
     id: textField
@@ -51,6 +52,7 @@ TextBase {
     property alias inputMethodHints: textInput.inputMethodHints
     property alias validator: textInput.validator
     property alias echoMode: textInput.echoMode
+    property int passwordMaskDelay: 1000
 
     editor: textInput
     mouseParent: flickable
@@ -70,8 +72,9 @@ TextBase {
         TextInput {
             id: textInput
 
-            property alias enterKeyText: textField.enterKeyText
-            property alias enterKeyEnabled: textField.enterKeyEnabled
+            EnterKeyAction.actionId: textField.enterKeyAction
+            EnterKeyAction.label: textField.enterKeyText
+            EnterKeyAction.enabled: textField.enterKeyEnabled
 
             y: 6
             focus: true
@@ -83,6 +86,13 @@ TextBase {
             selectedTextColor: Qt.rgba(0.0, 0.0, 0.0, 0.8)
             width: Math.max(flickable.width, implicitWidth)-2
             onActiveFocusChanged: if (!activeFocus) deselect()
+
+            Binding {
+                target: textInput
+                property: "passwordMaskDelay"
+                value: textField.passwordMaskDelay
+                when: textInput.hasOwnProperty("passwordMaskDelay")
+            }
         }
     }
 }