From e4b94dd19cccd769f8326df20556a8900e7cfb3f Mon Sep 17 00:00:00 2001
From: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Date: Tue, 7 Jan 2014 18:05:02 +0100
Subject: 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>
---
 src/widgets/styles/qstylesheetstyle.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src')

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;
         }
-- 
cgit v1.2.3