openkylin
/
qtbase-opensource-src
mirror of https://gitee.com/openkylin/qtbase-opensource-src.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix recursion crash when calling setStyleSheet with qproperty-styleSheet 

When calling setStyleSheet with property qproperty-styleSheet,
QStyleSheetStyle::polish will call QStyleSheetStyle::setProperties,
and then QStyleSheetStyle::setProperties goes on to call setProperty.
Because there is property qproperty-styleSheet, it will update
stylesheet by calling QStyleSheetStyle::polish.
This causes the recursive call to crash.
Origin: upstream, https://code.qt.io/cgit/qt/qtbase.git/commit/?id=e9cdcc7cb314586a
Last-Update: 2021-11-13

Gbp-Pq: Name fix_recursion_crash.diff
This commit is contained in:
Debian Qt/KDE Maintainers 2022-05-14 17:41:00 +08:00 committed by openKylinBot
parent fdd828e560
commit a2bad8b5ef
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/widgets/styles/qstylesheetstyle.cpp
View File

@ -2640,6 +2640,9 @@ void QStyleSheetStyle::setProperties(QWidget *w)
default: v = decl.d->values.at(0).variant; break;
}
if (propertyL1 == QByteArray("styleSheet") && value == v)
continue;
w->setProperty(propertyL1, v);
}
}

18
tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp
View File

@ -94,6 +94,7 @@ private slots:
void layoutSpacing();
#endif
void qproperty();
void qproperty_styleSheet();
void palettePropagation_data();
void palettePropagation();
void fontPropagation_data();
@ -678,6 +679,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