diff options
| author | Jens Bache-Wiig <jens.bache-wiig@digia.com> | 2013-02-05 11:35:28 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-05 11:40:14 +0100 |
| commit | 7cc3a3adf2952b94616785472f3541f97c4ee012 (patch) | |
| tree | 5c0a1c6b02f79d50d7bd9ed6d5683b06c183a140 /src/widgets | |
| parent | 0b8065b5819efd8ba3741ea5703d5b95954b16c2 (diff) | |
Added missing null pointer check in QMacStyle
QMacStyle::subElementRect could crash if SE_LineEditContents was used
without providing a widget pointer.
Task-number: QTBUG-27033
Change-Id: I15ef07ae1310be4257a8480d392f98dbf02168d3
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Diffstat (limited to 'src/widgets')
| -rw-r--r-- | src/widgets/styles/qmacstyle_mac.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/styles/qmacstyle_mac.mm b/src/widgets/styles/qmacstyle_mac.mm index bb2423adae..4bdd0a9bcb 100644 --- a/src/widgets/styles/qmacstyle_mac.mm +++ b/src/widgets/styles/qmacstyle_mac.mm @@ -4565,7 +4565,7 @@ QRect QMacStyle::subElementRect(SubElement sr, const QStyleOption *opt, break; case SE_LineEditContents: rect = QCommonStyle::subElementRect(sr, opt, widget); - if(widget->parentWidget() && qobject_cast<const QComboBox*>(widget->parentWidget())) + if (widget && qobject_cast<const QComboBox*>(widget->parentWidget())) rect.adjust(-1, -2, 0, 0); else rect.adjust(-1, -1, 0, +1); |