AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a possible crash in StyleSheetStyle

Browse Source 
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>
This commit is contained in:
Jens Bache-Wiig 2014-01-07 18:05:02 +01:00 committed by The Qt Project
parent 03b6a2f0f9
commit e4b94dd19c
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/widgets/styles/qstylesheetstyle.cpp
View File

@ -4710,7 +4710,9 @@ int QStyleSheetStyle::pixelMetric(PixelMetric m, const QStyleOption *opt, const
break; break;
case PM_TabBarBaseOverlap: { 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)) { if (hasStyleRule(tabWidget, PseudoElement_TabWidgetPane)) {
return 0; return 0;
} }