diff options
| author | Yann Bodson <yann.bodson@nokia.com> | 2009-07-23 07:01:58 (GMT) |
|---|---|---|
| committer | Yann Bodson <yann.bodson@nokia.com> | 2009-07-23 07:01:58 (GMT) |
| commit | 7465d6fca7ed193f71f2a68cd04e290c4436d4cf (patch) | |
| tree | 78bf4f9ff97ea9a7499d9016bca58e694e5f0afd /src/gui/styles/qstylesheetstyle.cpp | |
| parent | fa9a292388e93f128eac2ba4438f8b1e772a4782 (diff) | |
| parent | 7fe100b56ccca40de193164d3ce19600cf50bdd4 (diff) | |
| download | Qt-7465d6fca7ed193f71f2a68cd04e290c4436d4cf.zip Qt-7465d6fca7ed193f71f2a68cd04e290c4436d4cf.tar.gz Qt-7465d6fca7ed193f71f2a68cd04e290c4436d4cf.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
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 01d8aad..2efa4a7 100644 --- a/src/gui/styles/qstylesheetstyle.cpp +++ b/src/gui/styles/qstylesheetstyle.cpp @@ -4171,7 +4171,7 @@ void QStyleSheetStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *op if (!rule.hasDrawable()) { QWidget *container = containerWidget(w); if (autoFillDisabledWidgets->contains(container) - && (container == w || !renderRule(container, opt).hasDrawable())) { + && (container == w || !renderRule(container, opt).hasBackground())) { //we do not have a background, but we disabled the autofillbackground anyway. so fill the background now. // (this may happen if we have rules like :focus) p->fillRect(opt->rect, opt->palette.brush(w->backgroundRole())); |