From 8c15be7bb2488a17b2c2f62e2d2a7ed01dd331d6 Mon Sep 17 00:00:00 2001 From: Jens Bache-Wiig Date: Thu, 1 Nov 2012 12:47:40 +0100 Subject: Fix groupboxes for desktop components on mac MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The logic was a bit odd as it would check if the groupbox had a font set and then override it anyway. Since we anyway want the fallback to be used for components we just make sure that the fallback is to use the same code path. Change-Id: Ic5071b43cda76e2bb7356a6f71cc8458c4e8bf27 Reviewed-by: Morten Johan Sørvig --- src/widgets/styles/qmacstyle_mac.mm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/widgets') diff --git a/src/widgets/styles/qmacstyle_mac.mm b/src/widgets/styles/qmacstyle_mac.mm index 522d43dd28..b0a43c563c 100644 --- a/src/widgets/styles/qmacstyle_mac.mm +++ b/src/widgets/styles/qmacstyle_mac.mm @@ -5399,7 +5399,7 @@ void QMacStyle::drawComplexControl(ComplexControl cc, const QStyleOptionComplex QStyleOptionGroupBox groupBox(*gb); groupBox.state |= QStyle::State_Mini; // Force mini-sized checkbox to go with small-sized label bool didModifySubControls = false; - if ((widget && !widget->testAttribute(Qt::WA_SetFont)) + if ((!widget || !widget->testAttribute(Qt::WA_SetFont)) && QApplication::desktopSettingsAware()) { groupBox.subControls = groupBox.subControls & ~SC_GroupBoxLabel; didModifySubControls = true; -- cgit v1.2.3