diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-09 00:44:24 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-13 14:21:22 +0200 |
commit | b5552bab40f2e165cf7196993ffc83785f4d8264 (patch) | |
tree | 5ca863fc90caacebd7bd5ebd2464d4b18efdd0dc /src/widgets/styles/qmacstyle_mac.mm | |
parent | 9cfdd66b6452704349b5f986f31b7f1f03748cb5 (diff) | |
parent | 01ce104a3ee3c8af68f6694840931661666984ab (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Manually changed enum to LibGL in
src/plugins/platforms/xcb/qglxintegration.cpp
Change-Id: If34ee6cce3d1d51fb4bb1fdfa59c30389ea0d207
Diffstat (limited to 'src/widgets/styles/qmacstyle_mac.mm')
-rw-r--r-- | src/widgets/styles/qmacstyle_mac.mm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/widgets/styles/qmacstyle_mac.mm b/src/widgets/styles/qmacstyle_mac.mm index f3bbe11563..bedd9c74b6 100644 --- a/src/widgets/styles/qmacstyle_mac.mm +++ b/src/widgets/styles/qmacstyle_mac.mm @@ -1677,7 +1677,7 @@ QMacStylePrivate::QMacStylePrivate() if (ptrHIShapeGetBounds == 0) { QLibrary library(QLatin1String("/System/Library/Frameworks/Carbon.framework/Carbon")); library.setLoadHints(QLibrary::ExportExternalSymbolsHint); - ptrHIShapeGetBounds = reinterpret_cast<PtrHIShapeGetBounds>(library.resolve("HIShapeGetBounds")); + ptrHIShapeGetBounds = reinterpret_cast<PtrHIShapeGetBounds>(library.resolve("HIShapeGetBounds")); } } @@ -5300,7 +5300,7 @@ void QMacStyle::drawComplexControl(ComplexControl cc, const QStyleOptionComplex if (const QStyleOptionComboBox *combo = qstyleoption_cast<const QStyleOptionComboBox *>(opt)){ HIThemeButtonDrawInfo bdi; d->initComboboxBdi(combo, &bdi, widget, d->getDrawState(opt->state)); - if (!tds == kThemeStateInactive) + if (tds != kThemeStateInactive) QMacStylePrivate::drawCombobox(qt_hirectForQRect(combo->rect), bdi, p); else d->drawColorlessButton(qt_hirectForQRect(combo->rect), &bdi, p, opt); |