From 6a9b91754a2c30da798dcb1e8d3a5a987886aa2a Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Wed, 25 Mar 2009 10:55:23 +0100 Subject: Fix crash while styling the title bar of a QMdiArea with stylesheet This stylesheet used to crash: *::title { border 1px solid black } Reviewed-by: bnilsen --- src/gui/styles/qstylesheetstyle.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/gui/styles/qstylesheetstyle.cpp b/src/gui/styles/qstylesheetstyle.cpp index 2558409..f22cd56 100644 --- a/src/gui/styles/qstylesheetstyle.cpp +++ b/src/gui/styles/qstylesheetstyle.cpp @@ -4840,7 +4840,8 @@ int QStyleSheetStyle::pixelMetric(PixelMetric m, const QStyleOption *opt, const if (subRule.hasContentsSize()) return subRule.size().height(); else if (subRule.hasBox() || subRule.hasBorder()) { - return subRule.size(QSize(0, opt->fontMetrics.lineSpacing())).height(); + QFontMetrics fm = opt ? opt->fontMetrics : w->fontMetrics(); + return subRule.size(QSize(0, fm.lineSpacing())).height(); } break; } -- cgit v0.12