diff options
| author | Jarek Kobus <jkobus@trolltech.com> | 2009-04-28 07:20:27 (GMT) |
|---|---|---|
| committer | Jarek Kobus <jkobus@trolltech.com> | 2009-04-28 07:20:27 (GMT) |
| commit | 30087926ae942decd80632fbbb06eb389a343fac (patch) | |
| tree | d5d2b508e0b43c57c3a0037442ac1424941b2b64 /tests/auto | |
| parent | e372dc629927b60943568e9bbadb79fbaafab3a8 (diff) | |
| parent | 484d54532a773cf90ebf8c9c2c4f4d839b1b3744 (diff) | |
| download | Qt-30087926ae942decd80632fbbb06eb389a343fac.zip Qt-30087926ae942decd80632fbbb06eb389a343fac.tar.gz Qt-30087926ae942decd80632fbbb06eb389a343fac.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp b/tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp index aa63753..24ccecf 100644 --- a/tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp +++ b/tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp @@ -605,8 +605,9 @@ void tst_QStyleSheetStyle::palettePropagation() QVERIFY(COLOR(gb) == Qt::red); QVERIFY(COLOR(pb) == APPCOLOR(pb)); // palette shouldn't propagate gb.setStyleSheet("QGroupBox * { color: red }"); + QVERIFY(COLOR(pb) == Qt::red); - QVERIFY(COLOR(gb) == APPCOLOR(pb)); + QVERIFY(COLOR(gb) == APPCOLOR(gb)); QWidget window; window.setStyleSheet("* { color: white; }"); |