diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-07-15 15:30:08 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-07-15 15:30:08 (GMT) |
| commit | fbfc03eb8e7c3d41c4331895ae83912a4275e6c2 (patch) | |
| tree | ae6b553899bba4922d1210b0f8dc8da994834bc7 /src/gui/styles/qstylesheetstyle.cpp | |
| parent | 2d01fb17dbf7590dd60987b08433252eb95f55e0 (diff) | |
| parent | 9075ec9011e5f678563ab15024e8d9731e938963 (diff) | |
| download | Qt-fbfc03eb8e7c3d41c4331895ae83912a4275e6c2.zip Qt-fbfc03eb8e7c3d41c4331895ae83912a4275e6c2.tar.gz Qt-fbfc03eb8e7c3d41c4331895ae83912a4275e6c2.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
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())); |