Port placeholder rendering to palette placeholder color role

Change-Id: I7671d4b55677866b61627cc55a3029a3848f455d
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>

3 files changed, 3 insertions, 6 deletions

diff --git a/src/widgets/widgets/qlineedit.cpp b/src/widgets/widgets/qlineedit.cpp
index d7c9d7a44c..9e70b54601 100644
--- a/src/widgets/widgets/qlineedit.cpp
+++ b/src/widgets/widgets/qlineedit.cpp
@@ -1944,8 +1944,7 @@ void QLineEdit::paintEvent(QPaintEvent *)
         if (!d->placeholderText.isEmpty()) {
             const Qt::LayoutDirection layoutDir = d->placeholderText.isRightToLeft() ? Qt::RightToLeft : Qt::LeftToRight;
             const Qt::Alignment alignPhText = QStyle::visualAlignment(layoutDir, QFlag(d->alignment));
-            QColor col = pal.text().color();
-            col.setAlpha(128);
+            const QColor col = pal.placeholderText().color();
             QPen oldpen = p.pen();
             p.setPen(col);
             Qt::LayoutDirection oldLayoutDir = p.layoutDirection();
diff --git a/src/widgets/widgets/qplaintextedit.cpp b/src/widgets/widgets/qplaintextedit.cpp
index e66b702ffd..f654a12d34 100644
--- a/src/widgets/widgets/qplaintextedit.cpp
+++ b/src/widgets/widgets/qplaintextedit.cpp
@@ -1925,8 +1925,7 @@ void QPlainTextEdit::paintEvent(QPaintEvent *e)
     painter.setClipRect(er);
 
     if (d->placeholderVisible) {
-        QColor col = d->control->palette().text().color();
-        col.setAlpha(128);
+        const QColor col = d->control->palette().placeholderText().color();
         painter.setPen(col);
         painter.setClipRect(e->rect());
         const int margin = int(document()->documentMargin());
diff --git a/src/widgets/widgets/qtextedit.cpp b/src/widgets/widgets/qtextedit.cpp
index 95c85dc4fe..6bc4c113ce 100644
--- a/src/widgets/widgets/qtextedit.cpp
+++ b/src/widgets/widgets/qtextedit.cpp
@@ -1516,8 +1516,7 @@ void QTextEditPrivate::paint(QPainter *p, QPaintEvent *e)
         layout->setViewport(QRect());
 
     if (!placeholderText.isEmpty() && doc->isEmpty() && !control->isPreediting()) {
-        QColor col = control->palette().text().color();
-        col.setAlpha(128);
+        const QColor col = control->palette().placeholderText().color();
         p->setPen(col);
         const int margin = int(doc->documentMargin());
         p->drawText(viewport->rect().adjusted(margin, margin, -margin, -margin), Qt::AlignTop | Qt::TextWordWrap, placeholderText);