1 files changed, 80 insertions, 0 deletions
diff --git a/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp b/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp
index 82527849b0..a527d7c0fc 100644
--- a/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp
+++ b/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp
@@ -94,6 +94,7 @@ private slots:
     void layoutSpacing();
 #endif
     void qproperty();
+    void qproperty_styleSheet();
     void palettePropagation_data();
     void palettePropagation();
     void fontPropagation_data();
@@ -126,6 +127,9 @@ private slots:
     void QTBUG15910_crashNullWidget();
     void QTBUG36933_brokenPseudoClassLookup();
     void styleSheetChangeBeforePolish();
+    void placeholderColor();
+    void enumPropertySelector_data();
+    void enumPropertySelector();
     //at the end because it mess with the style.
     void widgetStyle();
     void appStyle();
@@ -677,6 +681,23 @@ void tst_QStyleSheetStyle::qproperty()
     QCOMPARE(pb.isChecked(), false);
 }
 
+void tst_QStyleSheetStyle::qproperty_styleSheet()
+{
+    QWidget w;
+    auto checkBox = new QCheckBox("check", &w);
+    QString sheet = R"(QCheckBox { qproperty-styleSheet: "QCheckBox { qproperty-text: foobar; }"; })";
+
+    QVERIFY(w.property("styleSheet").toString().isEmpty());
+
+    w.setStyleSheet(sheet);
+    QCOMPARE(checkBox->text(), "check");
+
+    //recursion crash
+    w.ensurePolished();
+    QCOMPARE(w.property("styleSheet").toString(), sheet);
+    QCOMPARE(checkBox->text(), "foobar");
+}
+
 namespace ns {
     class PushButton1 : public QPushButton {
         Q_OBJECT
@@ -2229,6 +2250,65 @@ 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();
+    QColor phColor = le1.palette().placeholderText().color();
+    QCOMPARE(phColor.rgb(), red.rgb());
+    QVERIFY(phColor.alpha() < red.alpha());
+
+    le2.ensurePolished();
+    phColor = le2.palette().placeholderText().color();
+    QCOMPARE(phColor.rgb(), red.rgb());
+    QVERIFY(phColor.alpha() < red.alpha());
+
+    le2.setEnabled(true);
+    phColor = le2.palette().placeholderText().color();
+    QCOMPARE(phColor.rgb(), red.rgb());
+    QVERIFY(phColor.alpha() < red.alpha());
+}
+
+void tst_QStyleSheetStyle::enumPropertySelector_data()
+{
+    QTest::addColumn<QString>("styleSheet");
+
+    QTest::addRow("Enum value") << R"(QToolButton[popupMode=MenuButtonPopup] { padding-right: 40px; })";
+    QTest::addRow("Int value") << R"(QToolButton[popupMode="1"] { padding-right: 40px; })";
+}
+
+void tst_QStyleSheetStyle::enumPropertySelector()
+{
+    QFETCH(QString, styleSheet);
+
+    QToolButton button;
+    QMenu menu;
+    menu.addAction("Action1");
+    QPixmap pm(50, 50);
+    pm.fill(Qt::red);
+    button.setIcon(pm);
+    button.setMenu(&menu);
+    button.setPopupMode(QToolButton::MenuButtonPopup);
+
+    button.show();
+    const QSize unstyledSizeHint = button.sizeHint();
+
+    qApp->setStyleSheet(styleSheet);
+    const QSize styledSizeHint = button.sizeHint();
+
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+    QEXPECT_FAIL("Enum value", "In Qt 5, style sheet selectors have to use integer enum values", Continue);
+#else
+    QEXPECT_FAIL("Int value", "In Qt 6, style sheet selectors must use the enum value name", Continue);
+#endif
+
+    QVERIFY(styledSizeHint.width() > unstyledSizeHint.width());
+}
+
 QTEST_MAIN(tst_QStyleSheetStyle)
 #include "tst_qstylesheetstyle.moc"