diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2010-08-24 13:09:04 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2010-08-24 13:09:04 (GMT) |
| commit | f58296de0d88f1b7f58efbabbb12a9e8afe6828c (patch) | |
| tree | 436b343e8a749b3fcff47c8cab0ddcecc35cddf8 /src/gui/styles/qstylesheetstyle.cpp | |
| parent | acf678e57ed088f3e56a551cac6c7c3322005750 (diff) | |
| parent | 7a5fa8af2d0c3329dd1962d6b053388a960f8305 (diff) | |
| download | Qt-f58296de0d88f1b7f58efbabbb12a9e8afe6828c.zip Qt-f58296de0d88f1b7f58efbabbb12a9e8afe6828c.tar.gz Qt-f58296de0d88f1b7f58efbabbb12a9e8afe6828c.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'src/gui/styles/qstylesheetstyle.cpp')
| -rw-r--r-- | src/gui/styles/qstylesheetstyle.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/styles/qstylesheetstyle.cpp b/src/gui/styles/qstylesheetstyle.cpp index dff525e..92e2c81 100644 --- a/src/gui/styles/qstylesheetstyle.cpp +++ b/src/gui/styles/qstylesheetstyle.cpp @@ -4094,7 +4094,7 @@ void QStyleSheetStyle::drawControl(ControlElement ce, const QStyleOption *opt, Q if (pe1 != PseudoElement_None) { QRenderRule subRule = renderRule(w, opt, pe1); if (subRule.bg != 0 || subRule.hasDrawable()) { - //We test subRule.bg dirrectly because hasBackground() would return false for background:none. + //We test subRule.bg directly because hasBackground() would return false for background:none. //But we still don't want the default drawning in that case (example for QScrollBar::add-page) (task 198926) subRule.drawRule(p, opt->rect); } else if (fallback) { |