diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-14 19:01:12 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-14 19:01:12 (GMT) |
| commit | 2dcdf662eaae913b318ca359770cb189c3f99af5 (patch) | |
| tree | 5a0151afc4d4646e377b6bfdf4e26278317c5f8e /src | |
| parent | 1b49d24d527278eb4a418ee3cefa9db86ee60557 (diff) | |
| parent | 0bf70c35bd51be4435c95f28dab96bf9f00b49db (diff) | |
| download | Qt-2dcdf662eaae913b318ca359770cb189c3f99af5.zip Qt-2dcdf662eaae913b318ca359770cb189c3f99af5.tar.gz Qt-2dcdf662eaae913b318ca359770cb189c3f99af5.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
QStyleSheetStyle: dont crash in PE_WIDGET when widget is null
Diffstat (limited to 'src')
| -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 2b3dffc..a4e7c38 100644 --- a/src/gui/styles/qstylesheetstyle.cpp +++ b/src/gui/styles/qstylesheetstyle.cpp @@ -4248,7 +4248,7 @@ void QStyleSheetStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *op return; case PE_Widget: - if (!rule.hasDrawable()) { + if (w && !rule.hasDrawable()) { QWidget *container = containerWidget(w); if (autoFillDisabledWidgets->contains(container) && (container == w || !renderRule(container, opt).hasBackground())) { |