diff options
| author | Jens Bache-Wiig <jens.bache-wiig@digia.com> | 2014-01-07 18:05:02 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-20 16:43:34 +0100 |
| commit | e4b94dd19cccd769f8326df20556a8900e7cfb3f (patch) | |
| tree | 5c3b86e017892c6e43617e22d871d805b662c764 /src/widgets | |
| parent | 03b6a2f0f98b70b24c0cce645d6d58c084111f91 (diff) | |
Fix a possible crash in StyleSheetStyle
Task-number: QTBUG-35901
Change-Id: I72e82a166d30cf5e4dac2917c633c7cbd355c817
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Diffstat (limited to 'src/widgets')
| -rw-r--r-- | src/widgets/styles/qstylesheetstyle.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/widgets/styles/qstylesheetstyle.cpp b/src/widgets/styles/qstylesheetstyle.cpp index 2f36e0e53c..6bd0ba37c8 100644 --- a/src/widgets/styles/qstylesheetstyle.cpp +++ b/src/widgets/styles/qstylesheetstyle.cpp @@ -4710,7 +4710,9 @@ int QStyleSheetStyle::pixelMetric(PixelMetric m, const QStyleOption *opt, const break; case PM_TabBarBaseOverlap: { - const QWidget *tabWidget = qobject_cast<const QTabWidget *>(w) ? w : w->parentWidget(); + const QWidget *tabWidget = qobject_cast<const QTabWidget *>(w); + if (!tabWidget && w) + tabWidget = w->parentWidget(); if (hasStyleRule(tabWidget, PseudoElement_TabWidgetPane)) { return 0; } |