Reapply 0d9208cecbbd9ed08e4ffb6540729668e3bd7754 on 5.11

This change amends 305dd1b61f657474d751cc3b24f58249ec21b61b, which lost
0d9208ce and brought src/plugins/styles/mac/qmacstyle_mac.mm back. In
4f3249f32dbe5c20aabbfd9b4f9c558aaf449e48, it was moved to
src/plugins/styles/mac in 5.10.

Task-number: QTBUG-65773
Change-Id: I721268caf12067ed798f5846234cd2fdf3e493dc
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
Reviewed-by: Jake Petroules <jake.petroules@qt.io>

src/plugins/styles/mac/qmacstyle_mac.mm

@@ -3348,13 +3348,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()),
@@ -4273,8 +4272,7 @@ void QMacStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPainter
                 const int xp = mi->rect.x() + macItemFrame;
                 checkmarkOpt.rect = QRect(xp, mi->rect.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 == QStyleHelper::SizeMini)
                     checkmarkOpt.state |= State_Mini;