Merge remote-tracking branch 'origin/5.9.3' into 5.10.0v5.10.0-rc3v5.10.0-rc2v5.10.0-rc1v5.10.0

Change-Id: Iacaf1656f2a66df0a97641f855aaf4d9d9189e6d

1 files changed, 19 insertions, 0 deletions

diff --git a/src/imports/controls/designer/TextAreaSpecifics.qml b/src/imports/controls/designer/TextAreaSpecifics.qml
index 20f5013b..e8bed83d 100644
--- a/src/imports/controls/designer/TextAreaSpecifics.qml
+++ b/src/imports/controls/designer/TextAreaSpecifics.qml
@@ -41,6 +41,25 @@ import QtQuick.Layouts 1.0
 Column {
     width: parent.width
 
+    Section {
+        width: parent.width
+        caption: qsTr("TextArea")
+
+        SectionLayout {
+            Label {
+                text: qsTr("Placeholder")
+                tooltip: qsTr("Placeholder text displayed when the editor is empty.")
+            }
+            SecondColumnLayout {
+                LineEdit {
+                    backendValue: backendValues.placeholderText
+                    Layout.fillWidth: true
+                }
+
+            }
+        }
+    }
+
     StandardTextSection {
         width: parent.width
         showIsWrapping: true