From e55ca5d08b29e67b699dc217abcb65e4a7655f72 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Mon, 7 Dec 2020 12:32:37 -0500 Subject: [PATCH 5/6] Revert "macOS: Fix use of deprecated NSOffState" This reverts commit 6a0995525d306a1fa224adcbcb9f0ae1fc7d01bd. --- src/plugins/styles/mac/qmacstyle_mac.mm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/styles/mac/qmacstyle_mac.mm b/src/plugins/styles/mac/qmacstyle_mac.mm index d1febd81d4..b5e6e60ec0 100644 --- a/src/plugins/styles/mac/qmacstyle_mac.mm +++ b/src/plugins/styles/mac/qmacstyle_mac.mm @@ -3955,7 +3955,7 @@ void QMacStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPainter pbCell = static_cast(pb.cell); oldPosition = pbCell.arrowPosition; pbCell.arrowPosition = NSPopUpNoArrow; - if (pb.state == NSControlStateValueOff) { + if (pb.state == NSOffState) { // NSPopUpButton in this state is smaller. rAdjusted.origin.x -= 3; rAdjusted.size.width += 6; -- 2.21.0