1 files changed, 95 insertions, 21 deletions

diff --git a/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp b/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp
index 55918a1173..a9a1817b8a 100644
--- a/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp
+++ b/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp
@@ -1,5 +1,5 @@
 // Copyright (C) 2019 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 #include <QtWidgets/QApplication>
 #include <QtWidgets/QCheckBox>
@@ -38,7 +38,7 @@
 #include <private/qstylesheetstyle_p.h>
 #include <private/qhighdpiscaling_p.h>
 #include <QtTest/private/qtesthelpers_p.h>
-
+#include <qpa/qplatformtheme.h>
 #include <QtWidgets/private/qapplication_p.h>
 
 using namespace QTestPrivate;
@@ -94,6 +94,7 @@ private slots:
     void proxyStyle();
     void dialogButtonBox();
     void emptyStyleSheet();
+    void toolTip_data();
     void toolTip();
     void embeddedFonts();
     void opaquePaintEvent_data();
@@ -106,6 +107,7 @@ private slots:
     void QTBUG36933_brokenPseudoClassLookup();
     void styleSheetChangeBeforePolish();
     void placeholderColor();
+    void accent();
     void enumPropertySelector_data();
     void enumPropertySelector();
     //at the end because it mess with the style.
@@ -120,6 +122,8 @@ private slots:
 
     void iconSizes_data();
     void iconSizes();
+    void inheritWidgetPalette_data();
+    void inheritWidgetPalette();
 
 private:
     static QColor COLOR(const QWidget &w)
@@ -976,7 +980,6 @@ void tst_QStyleSheetStyle::focusColors()
     centerOnScreen(&frame);
     frame.show();
 
-    QApplicationPrivate::setActiveWindow(&frame);
     QVERIFY(QTest::qWaitForWindowActive(&frame));
 
     for (QWidget *widget : frame.widgets()) {
@@ -1022,7 +1025,6 @@ void tst_QStyleSheetStyle::hoverColors()
     QCursor::setPos(frame.geometry().topLeft() - QPoint(100, 0));
     frame.show();
 
-    QApplicationPrivate::setActiveWindow(&frame);
     QVERIFY(QTest::qWaitForWindowActive(&frame));
 
     QWindow *frameWindow = frame.windowHandle();
@@ -1655,19 +1657,32 @@ private:
     const QString m_oldStyleName;
 };
 
+void tst_QStyleSheetStyle::toolTip_data()
+{
+    QTest::addColumn<QString>("style");
+
+    QTest::newRow("fusion") << QString("Fusion");
+#ifdef Q_OS_WINDOWS
+    QTest::newRow("windowsvista") << QString("WindowsVista");
+#endif
+}
+
 void tst_QStyleSheetStyle::toolTip()
 {
+    QFETCH(QString, style);
+
     if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
         QSKIP("Wayland: This fails. Figure out why.");
 
-    qApp->setStyleSheet(QString());
     QWidget w;
     w.resize(m_testSize);
     w.setWindowTitle(QTest::currentTestFunction());
+
     // Use "Fusion" to prevent the Vista style from clobbering the tooltip palette in polish().
-    QStyle *fusionStyle = QStyleFactory::create(QLatin1String("Fusion"));
-    QVERIFY(fusionStyle);
-    ApplicationStyleSetter as(fusionStyle);
+    QStyle *appStyle = QStyleFactory::create(style);
+    QVERIFY(appStyle);
+    ApplicationStyleSetter as(appStyle);
+
     QHBoxLayout layout(&w);
     w.setLayout(&layout);
 
@@ -1695,37 +1710,65 @@ void tst_QStyleSheetStyle::toolTip()
     wid4->setToolTip("this is wid4");
     wid4->setObjectName("wid4");
 
+    QWidget *wid5 = new QPushButton("wid5", &w);
+    layout.addWidget(wid5);
+    wid5->setStyleSheet("QToolTip { background: #ff0; color: #f00 }");
+    wid5->setToolTip("this is wid5");
+    wid5->setObjectName("wid5");
+
     centerOnScreen(&w);
     w.show();
-    QApplicationPrivate::setActiveWindow(&w);
     QVERIFY(QTest::qWaitForWindowActive(&w));
 
-    const QColor normalToolTip = QToolTip::palette().color(QPalette::Inactive, QPalette::ToolTipBase);
+    QColor normalToolTipBgColor = QToolTip::palette().color(QPalette::Inactive, QPalette::ToolTipBase);
+
+#ifdef Q_OS_MACOS
+    // macOS uses tool tip text color set in label palette
+    const QPalette *labelPalette = QGuiApplicationPrivate::platformTheme()->palette(QPlatformTheme::LabelPalette);
+    QColor normalToolTipFgColor = labelPalette->color(QPalette::Inactive, QPalette::ToolTipText);
+#else
+    QColor normalToolTipFgColor = QToolTip::palette().color(QPalette::Inactive, QPalette::ToolTipText);
+#endif
+
     // Tooltip on the widget without stylesheet, then to other widget,
     // including one without stylesheet (the tooltip will be reused,
     // but its color must change)
-    const QWidgetList widgets{wid4, wid1, wid2, wid3, wid4};
-    const QList<QColor> colors { normalToolTip, QColor("#ae2"), QColor("#f81"), QColor("#0b8"),
-                                 normalToolTip };
+    const QWidgetList widgets{wid4, wid1, wid2, wid3, wid4, wid5};
+    const QList<QColor> bgcolors { normalToolTipBgColor, QColor("#ae2"), QColor("#f81"),
+                                QColor("#0b8"), normalToolTipBgColor, QColor("#ff0")};
+    const QList<QColor> fgcolors { normalToolTipFgColor, normalToolTipFgColor, normalToolTipFgColor,
+                                normalToolTipFgColor, normalToolTipFgColor, QColor("#f00")};
 
     QWidgetList topLevels;
-    for (int i = 0; i < widgets.count() ; ++i) {
+    for (int i = 0; i < widgets.size() ; ++i) {
         QWidget *wid = widgets.at(i);
-        QColor col = colors.at(i);
+        QColor bgColor = bgcolors.at(i);
+        QColor fgColor = fgcolors.at(i);
 
         QToolTip::showText( QPoint(0,0) , "This is " + wid->objectName(), wid);
 
         topLevels = QApplication::topLevelWidgets();
         QWidget *tooltip = nullptr;
-        for (QWidget *widget : qAsConst(topLevels)) {
+        for (QWidget *widget : std::as_const(topLevels)) {
             if (widget->inherits("QTipLabel")) {
                 tooltip = widget;
                 break;
             }
         }
+
         QVERIFY(tooltip);
         QTRY_VERIFY(tooltip->isVisible()); // Wait until Roll-Effect is finished (Windows Vista)
-        QCOMPARE(tooltip->palette().color(tooltip->backgroundRole()), col);
+
+#ifdef Q_OS_WINDOWS
+        // If tooltip palette contains empty resolve mask, validate with inherited palette
+        if (!tooltip->palette().resolveMask()) {
+            bgColor = w.palette().color(tooltip->backgroundRole());
+            fgColor = w.palette().color(tooltip->foregroundRole());
+        }
+#endif
+
+        QCOMPARE(tooltip->palette().color(tooltip->backgroundRole()), bgColor);
+        QCOMPARE(tooltip->palette().color(tooltip->foregroundRole()), fgColor);
     }
 
     QToolTip::showText( QPoint(0,0) , "This is " + wid3->objectName(), wid3);
@@ -1733,7 +1776,7 @@ void tst_QStyleSheetStyle::toolTip()
     delete wid3; //should not crash;
     QTest::qWait(10);
     topLevels = QApplication::topLevelWidgets();
-    for (QWidget *widget : qAsConst(topLevels))
+    for (QWidget *widget : std::as_const(topLevels))
         widget->update(); //should not crash either
 }
 
@@ -1843,7 +1886,6 @@ void tst_QStyleSheetStyle::complexWidgetFocus()
 
     centerOnScreen(&frame);
     frame.show();
-    QApplicationPrivate::setActiveWindow(&frame);
     QVERIFY(QTest::qWaitForWindowActive(&frame));
     for (QWidget *widget : widgets) {
         widget->setFocus();
@@ -1932,7 +1974,6 @@ void tst_QStyleSheetStyle::task232085_spinBoxLineEditBg()
 
     centerOnScreen(&frame);
     frame.show();
-    QApplicationPrivate::setActiveWindow(&frame);
     spinbox->setFocus();
     QVERIFY(QTest::qWaitForWindowActive(&frame));
 
@@ -2068,7 +2109,6 @@ void tst_QStyleSheetStyle::QTBUG36933_brokenPseudoClassLookup()
     QVERIFY(QTest::qWaitForWindowExposed(&widget));
 
     widget.activateWindow();
-    QApplicationPrivate::setActiveWindow(&widget);
     QVERIFY(QTest::qWaitForWindowActive(&widget));
 
     QHeaderView *verticalHeader = widget.verticalHeader();
@@ -2360,6 +2400,15 @@ void tst_QStyleSheetStyle::placeholderColor()
     QCOMPARE(le1.palette().placeholderText().color(), QColor(phSpec));
 }
 
+void tst_QStyleSheetStyle::accent()
+{
+    QLineEdit lineEdit;
+    const QColor universe(42, 42, 42);
+    lineEdit.setStyleSheet(QString("QLineEdit { accent-color: %1; }").arg(universe.name()));
+    lineEdit.ensurePolished();
+    QCOMPARE(lineEdit.palette().accent().color(), universe);
+}
+
 void tst_QStyleSheetStyle::enumPropertySelector_data()
 {
     QTest::addColumn<QString>("styleSheet");
@@ -2454,6 +2503,31 @@ void tst_QStyleSheetStyle::iconSizes()
     QCOMPARE(button.iconSize(), iconSize);
 }
 
+void tst_QStyleSheetStyle::inheritWidgetPalette_data()
+{
+    QTest::addColumn<const QString>("styleSheet");
+    QTest::addColumn<const QColor>("phColorPalette");
+
+    QTest::addRow("blueAndGreen") << "QLineEdit {color: rgb(0,0,255);}" << QColor(Qt::green);
+    QTest::addRow("emptyStyleSheet") << QString() << QColor(Qt::green);
+
+}
+
+void tst_QStyleSheetStyle::inheritWidgetPalette()
+{
+    QFETCH(const QString, styleSheet);
+    QFETCH(const QColor, phColorPalette);
+
+    QLineEdit edit;
+    QPalette palette = edit.palette();
+    palette.setBrush(QPalette::PlaceholderText, phColorPalette);
+    edit.setPalette(palette);
+    edit.setStyleSheet(styleSheet);
+    const QColor phColor = edit.palette().placeholderText().color();
+
+    QCOMPARE(phColor, phColorPalette);
+}
+
 QTEST_MAIN(tst_QStyleSheetStyle)
 #include "tst_qstylesheetstyle.moc"