From acfe7fc8bb19c591a4c44d88aac95b3caa3d445f Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Fri, 16 Feb 2018 13:27:52 +0100 Subject: TextField: restore placeholder text color fixes The default values of the placeholder text colors were tweaked in b9584b1, but this was overridden by 77a693c that added a new placeholderTextColor property. Task-number: QTBUG-66176 Change-Id: I706388abdcc19a1c603e76353da79217076a2179 Reviewed-by: Mitch Curtis --- src/imports/controls/TextField.qml | 2 +- src/imports/controls/fusion/TextField.qml | 2 +- src/imports/controls/imagine/TextField.qml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/imports/controls/TextField.qml b/src/imports/controls/TextField.qml index 4f663178..da1eec38 100644 --- a/src/imports/controls/TextField.qml +++ b/src/imports/controls/TextField.qml @@ -55,7 +55,7 @@ T.TextField { color: control.palette.text selectionColor: control.palette.highlight selectedTextColor: control.palette.highlightedText - placeholderTextColor: Color.transparent(control.palette.text, 0.5) + placeholderTextColor: Color.transparent(control.color, 0.5) verticalAlignment: TextInput.AlignVCenter PlaceholderText { diff --git a/src/imports/controls/fusion/TextField.qml b/src/imports/controls/fusion/TextField.qml index 4fdcf980..2a1fe385 100644 --- a/src/imports/controls/fusion/TextField.qml +++ b/src/imports/controls/fusion/TextField.qml @@ -56,7 +56,7 @@ T.TextField { color: control.palette.text selectionColor: control.palette.highlight selectedTextColor: control.palette.highlightedText - placeholderTextColor: Color.transparent(control.palette.text, 0.5) + placeholderTextColor: Color.transparent(control.color, 0.5) verticalAlignment: TextInput.AlignVCenter PlaceholderText { diff --git a/src/imports/controls/imagine/TextField.qml b/src/imports/controls/imagine/TextField.qml index ba6e068d..2ba9d206 100644 --- a/src/imports/controls/imagine/TextField.qml +++ b/src/imports/controls/imagine/TextField.qml @@ -59,7 +59,7 @@ T.TextField { color: control.palette.text selectionColor: control.palette.highlight selectedTextColor: control.palette.highlightedText - placeholderTextColor: Color.transparent(control.palette.text, 0.5) + placeholderTextColor: Color.transparent(control.color, 0.5) verticalAlignment: Qt.AlignVCenter PlaceholderText { -- cgit v1.2.3