Set the PlaceholderText color in the palette from the stylesheet as well

The color should be used across the board, so the PlaceholderText color should also be respecting the one passed for Text and so on. Fixes: QTBUG-89815 Change-Id: I2accb3db35488f95a1c8ebacf2316a08ee416fac Reviewed-by: Volker Hilsheimer <[email protected]> (cherry picked from commit bb00b63) Reviewed-by: Qt Cherry-pick Bot <[email protected]>
boris-fx · Jan 28, 2021 · 5a9bcf5 · 5a9bcf5
1 parent 84a4f12
commit 5a9bcf5
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/src/widgets/styles/qstylesheetstyle.cpp b/src/widgets/styles/qstylesheetstyle.cpp
@@ -1458,6 +1458,7 @@ void QRenderRule::configurePalette(QPalette *p, QPalette::ColorGroup cg, const Q
         p->setBrush(cg, w->foregroundRole(), pal->foreground);
         p->setBrush(cg, QPalette::WindowText, pal->foreground);
         p->setBrush(cg, QPalette::Text, pal->foreground);
+        p->setBrush(cg, QPalette::PlaceholderText, pal->foreground);
     }
     if (pal->selectionBackground.style() != Qt::NoBrush)
         p->setBrush(cg, QPalette::Highlight, pal->selectionBackground);

diff --git a/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp b/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp
@@ -126,6 +126,7 @@ private slots:
     void QTBUG15910_crashNullWidget();
     void QTBUG36933_brokenPseudoClassLookup();
     void styleSheetChangeBeforePolish();
+    void placeholderColor();
     //at the end because it mess with the style.
     void widgetStyle();
     void appStyle();
@@ -2229,6 +2230,21 @@ void tst_QStyleSheetStyle::highdpiImages()
     QHighDpiScaling::updateHighDpiScaling(); // reset to normal
 }
 
+void tst_QStyleSheetStyle::placeholderColor()
+{
+    const QColor red(Qt::red);
+    qApp->setStyleSheet("* { color: red; }");
+    QLineEdit le1;
+    QLineEdit le2;
+    le2.setEnabled(false);
+    le1.ensurePolished();
+    QCOMPARE(le1.palette().placeholderText(), red);
+    le2.ensurePolished();
+    QCOMPARE(le2.palette().placeholderText(), red);
+    le2.setEnabled(true);
+    QCOMPARE(le2.palette().placeholderText(), red);
+}
+
 QTEST_MAIN(tst_QStyleSheetStyle)
 #include "tst_qstylesheetstyle.moc"