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

1 files changed, 0 insertions, 6 deletions

diff --git a/basicsuite/textinput/TextField.qml b/basicsuite/textinput/TextField.qml
index 9b01418..e95ded7 100644
--- a/basicsuite/textinput/TextField.qml
+++ b/basicsuite/textinput/TextField.qml
@@ -82,12 +82,6 @@ TextBase {
             selectionColor: Qt.rgba(1.0, 1.0, 1.0, 0.5)
             selectedTextColor: Qt.rgba(0.0, 0.0, 0.0, 0.8)
             width: Math.max(flickable.width, implicitWidth)-2
-            cursorDelegate: Rectangle {
-                width: 2
-                opacity: 0.7
-                color: "#EEEEEE"
-                visible: textInput.activeFocus
-            }
             onActiveFocusChanged: if (!activeFocus) deselect()
         }
     }