From a7f627b08d4c3e0dc963018c67c5f8aff3f77b4a Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Thu, 27 May 2021 09:04:16 +0200 Subject: Use the added placeHolderText color available in Palette This allows it to pick up the Palette's placeHolderText color by default while still using the property if it is overridden with that. Pick-to: 6.2 Task-number: QTBUG-93746 Change-Id: Ie6af95d6c60fa80f2789c2acd5964b5a347194ce Reviewed-by: Mitch Curtis --- tests/auto/palette/data/palette-appwindow-custom.qml | 1 + tests/auto/palette/data/palette-control-custom.qml | 1 + tests/auto/palette/data/palette-popup-custom.qml | 1 + tests/auto/palette/tst_palette.cpp | 1 + 4 files changed, 4 insertions(+) (limited to 'tests/auto') 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; -- cgit v1.2.3