diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-04-29 06:18:27 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-04-29 06:18:27 (GMT) |
| commit | 68999af7823e80aa049c19f332045b1fb074fb96 (patch) | |
| tree | b18b30c870157e1da14b8cf21568bb0d4684e0cf /tests/auto/qstylesheetstyle | |
| parent | bad50f8a2ef285aa9943291400cd322a6ec7af82 (diff) | |
| parent | 822114e976d7c6644f060ac366c08c92da1a4779 (diff) | |
| download | Qt-68999af7823e80aa049c19f332045b1fb074fb96.zip Qt-68999af7823e80aa049c19f332045b1fb074fb96.tar.gz Qt-68999af7823e80aa049c19f332045b1fb074fb96.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'tests/auto/qstylesheetstyle')
| -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 33f85d5..1a4b639 100644 --- a/tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp +++ b/tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp @@ -606,8 +606,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; }"); |