diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2018-08-24 16:51:23 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2018-08-31 12:35:45 +0000 |
| commit | 556beea4c373395e16aa00ae7e5e5db8e6f46468 (patch) | |
| tree | 9ec6c2058fd0bb46d22bc139d625d01362061cd0 /src/plugins/styles/mac | |
| parent | b02fe1bfe7bc5daa503dc3a274570aad0d8dca5a (diff) | |
macOS: Update all deprecated enums to their 10.12+ equivalents
Change-Id: I3034258da95c9c70eb6758db92967f438617f6e9
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
Diffstat (limited to 'src/plugins/styles/mac')
| -rw-r--r-- | src/plugins/styles/mac/qmacstyle_mac.mm | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/plugins/styles/mac/qmacstyle_mac.mm b/src/plugins/styles/mac/qmacstyle_mac.mm index dbf8a0c2e8..c70d1729c0 100644 --- a/src/plugins/styles/mac/qmacstyle_mac.mm +++ b/src/plugins/styles/mac/qmacstyle_mac.mm @@ -394,9 +394,9 @@ static bool setupSlider(NSSlider *slider, const QStyleOptionSlider *sl) const bool ticksAbove = sl->tickPosition == QSlider::TicksAbove; if (sl->orientation == Qt::Horizontal) - slider.tickMarkPosition = ticksAbove ? NSTickMarkAbove : NSTickMarkBelow; + slider.tickMarkPosition = ticksAbove ? NSTickMarkPositionAbove : NSTickMarkPositionBelow; else - slider.tickMarkPosition = ticksAbove ? NSTickMarkLeft : NSTickMarkRight; + slider.tickMarkPosition = ticksAbove ? NSTickMarkPositionLeading : NSTickMarkPositionTrailing; } else { slider.numberOfTickMarks = 0; } @@ -1785,10 +1785,10 @@ NSView *QMacStylePrivate::cocoaControl(CocoaControl widget) const auto *ctrl = static_cast<NSControl *>(bv); switch (widget.size) { case QStyleHelper::SizeSmall: - ctrl.controlSize = NSSmallControlSize; + ctrl.controlSize = NSControlSizeSmall; break; case QStyleHelper::SizeMini: - ctrl.controlSize = NSMiniControlSize; + ctrl.controlSize = NSControlSizeMini; break; default: break; @@ -1799,10 +1799,10 @@ NSView *QMacStylePrivate::cocoaControl(CocoaControl widget) const pi.indeterminate = (widget.type == ProgressIndicator_Indeterminate); switch (widget.size) { case QStyleHelper::SizeSmall: - pi.controlSize = NSSmallControlSize; + pi.controlSize = NSControlSizeSmall; break; case QStyleHelper::SizeMini: - pi.controlSize = NSMiniControlSize; + pi.controlSize = NSControlSizeMini; break; default: break; @@ -1848,10 +1848,10 @@ NSCell *QMacStylePrivate::cocoaCell(CocoaControl widget) const switch (widget.size) { case QStyleHelper::SizeSmall: - cell.controlSize = NSSmallControlSize; + cell.controlSize = NSControlSizeSmall; break; case QStyleHelper::SizeMini: - cell.controlSize = NSMiniControlSize; + cell.controlSize = NSControlSizeMini; break; default: break; @@ -2191,9 +2191,9 @@ int QMacStyle::pixelMetric(PixelMetric metric, const QStyleOption *opt, const QW ret = 0; break; case PM_TitleBarHeight: { - NSUInteger style = NSTitledWindowMask; + NSUInteger style = NSWindowStyleMaskTitled; if (widget && ((widget->windowFlags() & Qt::Tool) == Qt::Tool)) - style |= NSUtilityWindowMask; + style |= NSWindowStyleMaskUtilityWindow; ret = int([NSWindow frameRectForContentRect:NSZeroRect styleMask:style].size.height); break; } |