AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Merge remote-tracking branch 'origin/5.9.4' into 5.9" into refs/staging/5.9

Browse Source
This commit is contained in:
Liang Qi 2018-01-18 10:05:21 +00:00 committed by The Qt Project
commit 0688a755e6
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dist/changes-5.9.4 vendored
View File

@ -65,6 +65,12 @@ QtCore
QtNetwork 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: - QUdpSocket:
* [QTBUG-64718] Fixed a regression from Qt 5.9.3 caused by an apparent * [QTBUG-64718] Fixed a regression from Qt 5.9.3 caused by an apparent
Win32 API quirk we triggered when using readDatagram(), resulting in Win32 API quirk we triggered when using readDatagram(), resulting in

8
src/widgets/styles/qmacstyle_mac.mm
View File

@ -3389,13 +3389,12 @@ void QMacStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPai
} }
break; break;
case PE_IndicatorMenuCheckMark: { case PE_IndicatorMenuCheckMark: {
if (!(opt->state & State_On))
break;
QColor pc; QColor pc;
if (opt->state & State_Selected) if (opt->state & State_On)
pc = opt->palette.highlightedText().color(); pc = opt->palette.highlightedText().color();
else else
pc = opt->palette.text().color(); pc = opt->palette.text().color();
QCFType<CGColorRef> checkmarkColor = CGColorCreateGenericRGB(static_cast<CGFloat>(pc.redF()), QCFType<CGColorRef> checkmarkColor = CGColorCreateGenericRGB(static_cast<CGFloat>(pc.redF()),
static_cast<CGFloat>(pc.greenF()), static_cast<CGFloat>(pc.greenF()),
static_cast<CGFloat>(pc.blueF()), static_cast<CGFloat>(pc.blueF()),
@ -4493,8 +4492,7 @@ void QMacStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPainter
const int xp = contentRect.x() + macItemFrame; const int xp = contentRect.x() + macItemFrame;
checkmarkOpt.rect = QRect(xp, contentRect.y() - checkmarkOpt.fontMetrics.descent(), mw, mh); 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_On, active);
checkmarkOpt.state.setFlag(State_Selected, active);
checkmarkOpt.state.setFlag(State_Enabled, enabled); checkmarkOpt.state.setFlag(State_Enabled, enabled);
if (widgetSize == QAquaSizeMini) if (widgetSize == QAquaSizeMini)
checkmarkOpt.state |= State_Mini; checkmarkOpt.state |= State_Mini;