13 files changed, 14 insertions, 8 deletions
diff --git a/src/quickcontrols2/basic/TextArea.qml b/src/quickcontrols2/basic/TextArea.qml
index fa6112f6..99d73362 100644
--- a/src/quickcontrols2/basic/TextArea.qml
+++ b/src/quickcontrols2/basic/TextArea.qml
@@ -52,7 +52,7 @@ T.TextArea {
     leftPadding: padding + 4
 
     color: control.palette.text
-    placeholderTextColor: Color.transparent(control.color, 0.5)
+    placeholderTextColor: control.palette.placeholderText
     selectionColor: control.palette.highlight
     selectedTextColor: control.palette.highlightedText
 
diff --git a/src/quickcontrols2/basic/TextField.qml b/src/quickcontrols2/basic/TextField.qml
index 9c66e4ba..2833916e 100644
--- a/src/quickcontrols2/basic/TextField.qml
+++ b/src/quickcontrols2/basic/TextField.qml
@@ -53,7 +53,7 @@ T.TextField {
     color: control.palette.text
     selectionColor: control.palette.highlight
     selectedTextColor: control.palette.highlightedText
-    placeholderTextColor: Color.transparent(control.color, 0.5)
+    placeholderTextColor: control.palette.placeholderText
     verticalAlignment: TextInput.AlignVCenter
 
     PlaceholderText {
diff --git a/src/quickcontrols2/basic/qquickbasictheme.cpp b/src/quickcontrols2/basic/qquickbasictheme.cpp
index 1f876e3d..c65a7bc1 100644
--- a/src/quickcontrols2/basic/qquickbasictheme.cpp
+++ b/src/quickcontrols2/basic/qquickbasictheme.cpp
@@ -83,6 +83,8 @@ void QQuickBasicTheme::initialize(QQuickTheme *theme)
     systemPalette.setColor(QPalette::WindowText, QColor::fromRgba(0xFF26282A));
     systemPalette.setColor(QPalette::Disabled, QPalette::WindowText, QColor::fromRgba(0xFFBDBEBF));
 
+    systemPalette.setColor(QPalette::PlaceholderText, QColor::fromRgba(0x88353637));
+
     theme->setPalette(QQuickTheme::System, systemPalette);
 }
 
diff --git a/src/quickcontrols2/fusion/TextArea.qml b/src/quickcontrols2/fusion/TextArea.qml
index dc963186..5346aad1 100644
--- a/src/quickcontrols2/fusion/TextArea.qml
+++ b/src/quickcontrols2/fusion/TextArea.qml
@@ -56,7 +56,7 @@ T.TextArea {
     color: control.palette.text
     selectionColor: control.palette.highlight
     selectedTextColor: control.palette.highlightedText
-    placeholderTextColor: Color.transparent(control.color, 0.5)
+    placeholderTextColor: control.palette.placeholderText
 
     PlaceholderText {
         id: placeholder
diff --git a/src/quickcontrols2/fusion/TextField.qml b/src/quickcontrols2/fusion/TextField.qml
index 1a7ec2b9..d99c3664 100644
--- a/src/quickcontrols2/fusion/TextField.qml
+++ b/src/quickcontrols2/fusion/TextField.qml
@@ -54,7 +54,7 @@ T.TextField {
     color: control.palette.text
     selectionColor: control.palette.highlight
     selectedTextColor: control.palette.highlightedText
-    placeholderTextColor: Color.transparent(control.color, 0.5)
+    placeholderTextColor: control.palette.placeholderText
     verticalAlignment: TextInput.AlignVCenter
 
     PlaceholderText {
diff --git a/src/quickcontrols2/imagine/TextArea.qml b/src/quickcontrols2/imagine/TextArea.qml
index a4597593..556e746a 100644
--- a/src/quickcontrols2/imagine/TextArea.qml
+++ b/src/quickcontrols2/imagine/TextArea.qml
@@ -64,7 +64,7 @@ T.TextArea {
     selectionColor: control.palette.highlight
     selectedTextColor: control.palette.highlightedText
     verticalAlignment: Qt.AlignVCenter
-    placeholderTextColor: Color.transparent(control.color, 0.5)
+    placeholderTextColor: control.palette.placeholderText
 
     PlaceholderText {
         id: placeholder
diff --git a/src/quickcontrols2/imagine/TextField.qml b/src/quickcontrols2/imagine/TextField.qml
index 15e73aa5..e641a749 100644
--- a/src/quickcontrols2/imagine/TextField.qml
+++ b/src/quickcontrols2/imagine/TextField.qml
@@ -62,7 +62,7 @@ T.TextField {
     color: control.palette.text
     selectionColor: control.palette.highlight
     selectedTextColor: control.palette.highlightedText
-    placeholderTextColor: Color.transparent(control.color, 0.5)
+    placeholderTextColor: control.palette.placeholderText
     verticalAlignment: Qt.AlignVCenter
 
     PlaceholderText {
diff --git a/src/quicknativestyle/controls/DefaultTextArea.qml b/src/quicknativestyle/controls/DefaultTextArea.qml
index 5a72b91a..c634da7e 100644
--- a/src/quicknativestyle/controls/DefaultTextArea.qml
+++ b/src/quicknativestyle/controls/DefaultTextArea.qml
@@ -58,7 +58,7 @@ T.TextArea {
     color: control.palette.text
     selectionColor: control.palette.highlight
     selectedTextColor: control.palette.highlightedText
-    placeholderTextColor: Color.transparent(control.color, 0.5)
+    placeholderTextColor: control.palette.placeholderText
     verticalAlignment: TextInput.AlignTop
 
     PlaceholderText {
diff --git a/src/quicknativestyle/controls/DefaultTextField.qml b/src/quicknativestyle/controls/DefaultTextField.qml
index d8bee337..8f8c8e4d 100644
--- a/src/quicknativestyle/controls/DefaultTextField.qml
+++ b/src/quicknativestyle/controls/DefaultTextField.qml
@@ -62,7 +62,7 @@ T.TextField {
     color: control.palette.text
     selectionColor: control.palette.highlight
     selectedTextColor: control.palette.highlightedText
-    placeholderTextColor: Color.transparent(control.color, 0.5)
+    placeholderTextColor: control.palette.placeholderText
     verticalAlignment: TextInput.AlignTop
 
     PlaceholderText {
diff --git a/tests/auto/palette/data/palette-appwindow-custom.qml b/tests/auto/palette/data/palette-appwindow-custom.qml
index f5f75ae7..95f9fde6 100644
--- a/tests/auto/palette/data/palette-appwindow-custom.qml
+++ b/tests/auto/palette/data/palette-appwindow-custom.qml
@@ -71,4 +71,5 @@ ApplicationWindow {
     palette.toolTipText: "orchid"
     palette.window: "plum"
     palette.windowText: "salmon"
+    palette.placeholderText: "magenta"
 }
diff --git a/tests/auto/palette/data/palette-control-custom.qml b/tests/auto/palette/data/palette-control-custom.qml
index 6915404d..7f3bfde5 100644
--- a/tests/auto/palette/data/palette-control-custom.qml
+++ b/tests/auto/palette/data/palette-control-custom.qml
@@ -71,4 +71,5 @@ Control {
     palette.toolTipText: "orchid"
     palette.window: "plum"
     palette.windowText: "salmon"
+    palette.placeholderText: "magenta"
 }
diff --git a/tests/auto/palette/data/palette-popup-custom.qml b/tests/auto/palette/data/palette-popup-custom.qml
index 47f52d17..6f35f452 100644
--- a/tests/auto/palette/data/palette-popup-custom.qml
+++ b/tests/auto/palette/data/palette-popup-custom.qml
@@ -71,4 +71,5 @@ Popup {
     palette.toolTipText: "orchid"
     palette.window: "plum"
     palette.windowText: "salmon"
+    palette.placeholderText: "magenta"
 }
diff --git a/tests/auto/palette/tst_palette.cpp b/tests/auto/palette/tst_palette.cpp
index ca1675f1..d8e1a3bf 100644
--- a/tests/auto/palette/tst_palette.cpp
+++ b/tests/auto/palette/tst_palette.cpp
@@ -130,6 +130,7 @@ void tst_palette::palette_data()
     customPalette.setColor(QPalette::ToolTipText, QColor("orchid"));
     customPalette.setColor(QPalette::Window, QColor("plum"));
     customPalette.setColor(QPalette::WindowText, QColor("salmon"));
+    customPalette.setColor(QPalette::PlaceholderText, QColor("magenta"));
 
     QTest::newRow("Control:custom") << "palette-control-custom.qml" << customPalette;
     QTest::newRow("AppWindow:custom") << "palette-appwindow-custom.qml" << customPalette;