diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-18 10:59:44 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-18 10:59:44 +0100 |
| commit | bd46858d697b454ec954d23d70ffd0a62a9c735e (patch) | |
| tree | 67aba8c8c6d8916d37a9d630545904a3abacce78 | |
| parent | a57585961823cfc4d9a20ffd5dde3520c9229d61 (diff) | |
| parent | 0d9208cecbbd9ed08e4ffb6540729668e3bd7754 (diff) | |
Merge remote-tracking branch 'origin/5.9.4' into 5.9
Change-Id: If83012432650a697fe4e8e773ade366589b63b0d
| -rw-r--r-- | dist/changes-5.9.4 | 6 | ||||
| -rw-r--r-- | src/widgets/styles/qmacstyle_mac.mm | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/dist/changes-5.9.4 b/dist/changes-5.9.4 index 0bb768424f..f0cc6007c2 100644 --- a/dist/changes-5.9.4 +++ b/dist/changes-5.9.4 @@ -65,6 +65,12 @@ QtCore QtNetwork --------- + - Bearer Management: + * [QTBUG-40332] The nativewifi (Windows) bearer plugin was determined + to be causing network interference in the form of system-wide higher + latency and has been disabled. The CoreWlan (macOS) plugin has also + been disabled. + - QUdpSocket: * [QTBUG-64718] Fixed a regression from Qt 5.9.3 caused by an apparent Win32 API quirk we triggered when using readDatagram(), resulting in diff --git a/src/widgets/styles/qmacstyle_mac.mm b/src/widgets/styles/qmacstyle_mac.mm index f45bf7011f..e6436f82a6 100644 --- a/src/widgets/styles/qmacstyle_mac.mm +++ b/src/widgets/styles/qmacstyle_mac.mm @@ -3389,13 +3389,12 @@ void QMacStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPai } break; case PE_IndicatorMenuCheckMark: { - if (!(opt->state & State_On)) - break; QColor pc; - if (opt->state & State_Selected) + if (opt->state & State_On) pc = opt->palette.highlightedText().color(); else pc = opt->palette.text().color(); + QCFType<CGColorRef> checkmarkColor = CGColorCreateGenericRGB(static_cast<CGFloat>(pc.redF()), static_cast<CGFloat>(pc.greenF()), static_cast<CGFloat>(pc.blueF()), @@ -4493,8 +4492,7 @@ void QMacStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPainter const int xp = contentRect.x() + macItemFrame; checkmarkOpt.rect = QRect(xp, contentRect.y() - checkmarkOpt.fontMetrics.descent(), mw, mh); - checkmarkOpt.state |= State_On; // Always on. Never rendered when off. - checkmarkOpt.state.setFlag(State_Selected, active); + checkmarkOpt.state.setFlag(State_On, active); checkmarkOpt.state.setFlag(State_Enabled, enabled); if (widgetSize == QAquaSizeMini) checkmarkOpt.state |= State_Mini; |