diff options
| author | Jens Bache-Wiig <jens.bache-wiig@digia.com> | 2012-11-01 12:47:40 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-01 20:17:57 +0100 |
| commit | 8c15be7bb2488a17b2c2f62e2d2a7ed01dd331d6 (patch) | |
| tree | 75e7abe2ff9a3242da6db0c08947e9b8df141ab3 /src/widgets | |
| parent | 5b21b6a7f0d9a9462a6b3fa45c32cb81feaaff49 (diff) | |
Fix groupboxes for desktop components on mac
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 <morten.sorvig@digia.com>
Diffstat (limited to 'src/widgets')
| -rw-r--r-- | src/widgets/styles/qmacstyle_mac.mm | 2 |
1 files changed, 1 insertions, 1 deletions
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; |