diff options
| author | Nils Christian Roscher-Nielsen <nils.christian@trolltech.com> | 2009-05-06 15:46:36 (GMT) |
|---|---|---|
| committer | Nils Christian Roscher-Nielsen <nils.christian@trolltech.com> | 2009-05-06 15:46:36 (GMT) |
| commit | c331495646cb4f64c00f5bfd0bd79405eb36b558 (patch) | |
| tree | 5cec46c7d0f7d005aa2694a6f51d02144737b51f /src | |
| parent | a86c2b58d80b0688b98d0eaf243508a096f699b1 (diff) | |
| parent | 9f7e8dcd408f8a082d6b8355c78c692d71becbb8 (diff) | |
| download | Qt-c331495646cb4f64c00f5bfd0bd79405eb36b558.zip Qt-c331495646cb4f64c00f5bfd0bd79405eb36b558.tar.gz Qt-c331495646cb4f64c00f5bfd0bd79405eb36b558.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
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 058660e..714b8c5 100644 --- a/src/gui/styles/qstylesheetstyle.cpp +++ b/src/gui/styles/qstylesheetstyle.cpp @@ -4926,7 +4926,7 @@ QSize QStyleSheetStyle::sizeFromContents(ContentsType ct, const QStyleOption *op case CT_LineEdit: #ifndef QT_NO_SPINBOX // ### hopelessly broken QAbstractSpinBox (part 2) - if (QAbstractSpinBox *spinBox = qobject_cast<QAbstractSpinBox *>(w->parentWidget())) { + if (QAbstractSpinBox *spinBox = qobject_cast<QAbstractSpinBox *>(w ? w->parentWidget() : 0)) { QRenderRule rule = renderRule(spinBox, opt); if (rule.hasBox() || !rule.hasNativeBorder()) return csz; |