1 files changed, 8 insertions, 29 deletions

diff --git a/src/imports/controls/material/TextField.qml b/src/imports/controls/material/TextField.qml
index 4b4d24a9..f5c77f86 100644
--- a/src/imports/controls/material/TextField.qml
+++ b/src/imports/controls/material/TextField.qml
@@ -34,9 +34,12 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.8
-import QtQuick.Templates 2.1 as T
-import QtQuick.Controls.Material 2.1
+import QtQuick 2.9
+import QtQuick.Templates 2.2 as T
+import QtQuick.Controls 2.2
+import QtQuick.Controls.impl 2.2
+import QtQuick.Controls.Material 2.2
+import QtQuick.Controls.Material.impl 2.2
 
 T.TextField {
     id: control
@@ -55,33 +58,10 @@ T.TextField {
     selectionColor: Material.accentColor
     selectedTextColor: Material.primaryHighlightedTextColor
     verticalAlignment: TextInput.AlignVCenter
-    cursorDelegate: Rectangle {
-        id: cursor
-        color: control.Material.accentColor
-        width: 2
-        visible: control.activeFocus && control.selectionStart === control.selectionEnd
 
-        Connections {
-            target: control
-            onCursorPositionChanged: {
-                // keep a moving cursor visible
-                cursor.opacity = 1
-                timer.restart()
-            }
-        }
+    cursorDelegate: CursorDelegate { }
 
-        Timer {
-            id: timer
-            running: control.activeFocus
-            repeat: true
-            interval: Qt.styleHints.cursorFlashTime / 2
-            onTriggered: cursor.opacity = !cursor.opacity ? 1 : 0
-            // force the cursor visible when gaining focus
-            onRunningChanged: cursor.opacity = 1
-        }
-    }
-
-    Text {
+    PlaceholderText {
         id: placeholder
         x: control.leftPadding
         y: control.topPadding
@@ -90,7 +70,6 @@ T.TextField {
         text: control.placeholderText
         font: control.font
         color: control.Material.hintTextColor
-        horizontalAlignment: control.horizontalAlignment
         verticalAlignment: control.verticalAlignment
         elide: Text.ElideRight
         visible: !control.length && !control.preeditText && (!control.activeFocus || control.horizontalAlignment !== Qt.AlignHCenter)