diff --git a/src/corelib/platform/darwin/qdarwinpermissionplugin_location.mm b/src/corelib/platform/darwin/qdarwinpermissionplugin_location.mm index 1d32c0fcacb..4aa35f3920f 100644 --- a/src/corelib/platform/darwin/qdarwinpermissionplugin_location.mm +++ b/src/corelib/platform/darwin/qdarwinpermissionplugin_location.mm @@ -103,19 +103,15 @@ struct PermissionRequest - (CLAuthorizationStatus)authorizationStatus { - if (self.manager) { - if (@available(macOS 11, iOS 14, *)) - return self.manager.authorizationStatus; - } + if (self.manager) + return self.manager.authorizationStatus; return QT_IGNORE_DEPRECATIONS(CLLocationManager.authorizationStatus); } - (Qt::PermissionStatus)accuracyAuthorization:(QLocationPermission)permission { - auto status = CLAccuracyAuthorizationReducedAccuracy; - if (@available(macOS 11, iOS 14, *)) - status = self.manager.accuracyAuthorization; + auto status = self.manager.accuracyAuthorization; switch (status) { case CLAccuracyAuthorizationFullAccuracy: diff --git a/src/gui/platform/darwin/qapplekeymapper.mm b/src/gui/platform/darwin/qapplekeymapper.mm index b8ff5c9d6dd..9166d8baba3 100644 --- a/src/gui/platform/darwin/qapplekeymapper.mm +++ b/src/gui/platform/darwin/qapplekeymapper.mm @@ -455,23 +455,21 @@ const QAppleKeyMapper::KeyMap &QAppleKeyMapper::keyMapForKey(VirtualKeyCode virt if (err == noErr && actualStringLength) carbonUnicodeKey = QChar(unicodeString[0]); - if (@available(macOS 10.15, *)) { - if (canMapCocoaEvent) { - // Until we've verified that the Cocoa API works as expected - // we first run the event through the Carbon APIs and then - // compare the results to Cocoa. - auto cocoaModifiers = toCocoaModifiers(qtModifiers); - auto *charactersWithModifiers = [NSApp.currentEvent charactersByApplyingModifiers:cocoaModifiers]; + if (canMapCocoaEvent) { + // Until we've verified that the Cocoa API works as expected + // we first run the event through the Carbon APIs and then + // compare the results to Cocoa. + auto cocoaModifiers = toCocoaModifiers(qtModifiers); + auto *charactersWithModifiers = [NSApp.currentEvent charactersByApplyingModifiers:cocoaModifiers]; - QChar cocoaUnicodeKey; - if (charactersWithModifiers.length > 0) - cocoaUnicodeKey = QChar([charactersWithModifiers characterAtIndex:0]); + QChar cocoaUnicodeKey; + if (charactersWithModifiers.length > 0) + cocoaUnicodeKey = QChar([charactersWithModifiers characterAtIndex:0]); - if (cocoaUnicodeKey != carbonUnicodeKey) { - qCWarning(lcQpaKeyMapper) << "Mismatch between Cocoa" << cocoaUnicodeKey - << "and Carbon" << carbonUnicodeKey << "for virtual key" << virtualKey - << "with" << qtModifiers; - } + if (cocoaUnicodeKey != carbonUnicodeKey) { + qCWarning(lcQpaKeyMapper) << "Mismatch between Cocoa" << cocoaUnicodeKey + << "and Carbon" << carbonUnicodeKey << "for virtual key" << virtualKey + << "with" << qtModifiers; } } diff --git a/src/gui/text/coretext/qcoretextfontdatabase.mm b/src/gui/text/coretext/qcoretextfontdatabase.mm index 19f3a2b3352..2197c83f293 100644 --- a/src/gui/text/coretext/qcoretextfontdatabase.mm +++ b/src/gui/text/coretext/qcoretextfontdatabase.mm @@ -951,15 +951,13 @@ void QCoreTextFontDatabase::populateThemeFonts() }; // Try populating the font variants based on its UI design trait, if available - if (@available(macos 10.15, ios 13.0, *)) { - auto fontTraits = QCFType(CTFontDescriptorCopyAttribute(fontDescriptor, kCTFontTraitsAttribute)); - static const NSString *kUIFontDesignTrait = @"NSCTFontUIFontDesignTrait"; - if (id uiFontDesignTrait = fontTraits.as()[kUIFontDesignTrait]) { - QCFType designTraitDescriptor = CTFontDescriptorCreateWithAttributes( - CFDictionaryRef(@{ (id)kCTFontTraitsAttribute: @{ kUIFontDesignTrait: uiFontDesignTrait } - })); - addFontVariants(designTraitDescriptor); - } + auto fontTraits = QCFType(CTFontDescriptorCopyAttribute(fontDescriptor, kCTFontTraitsAttribute)); + static const NSString *kUIFontDesignTrait = @"NSCTFontUIFontDesignTrait"; + if (id uiFontDesignTrait = fontTraits.as()[kUIFontDesignTrait]) { + QCFType designTraitDescriptor = CTFontDescriptorCreateWithAttributes( + CFDictionaryRef(@{ (id)kCTFontTraitsAttribute: @{ kUIFontDesignTrait: uiFontDesignTrait } + })); + addFontVariants(designTraitDescriptor); } if (themeFontVariants.isEmpty()) { diff --git a/src/plugins/platforms/cocoa/qcocoamessagedialog.mm b/src/plugins/platforms/cocoa/qcocoamessagedialog.mm index 84525099c96..f786fc65c45 100644 --- a/src/plugins/platforms/cocoa/qcocoamessagedialog.mm +++ b/src/plugins/platforms/cocoa/qcocoamessagedialog.mm @@ -170,8 +170,7 @@ bool QCocoaMessageDialog::show(Qt::WindowFlags windowFlags, Qt::WindowModality w else if ([button.keyEquivalent isEqualToString:@"\e"]) button.keyEquivalent = @""; - if (@available(macOS 11, *)) - button.hasDestructiveAction = role == DestructiveRole; + button.hasDestructiveAction = role == DestructiveRole; // The NSModalResponse of showing an NSAlert normally depends on the order of the // button that was clicked, starting from the right with NSAlertFirstButtonReturn (1000), diff --git a/src/plugins/platforms/cocoa/qcocoascreen.mm b/src/plugins/platforms/cocoa/qcocoascreen.mm index 2249658189e..55526d6cdc7 100644 --- a/src/plugins/platforms/cocoa/qcocoascreen.mm +++ b/src/plugins/platforms/cocoa/qcocoascreen.mm @@ -197,38 +197,6 @@ QCocoaScreen::~QCocoaScreen() dispatch_release(m_displayLinkSource); } -static QString displayName(CGDirectDisplayID displayID) -{ - QIOType iterator; - if (IOServiceGetMatchingServices(kIOMainPortDefault, - IOServiceMatching("IODisplayConnect"), &iterator)) - return QString(); - - QIOType display; - while ((display = IOIteratorNext(iterator)) != 0) - { - NSDictionary *info = [(__bridge NSDictionary*)IODisplayCreateInfoDictionary( - display, kIODisplayOnlyPreferredName) autorelease]; - - if ([[info objectForKey:@kDisplayVendorID] unsignedIntValue] != CGDisplayVendorNumber(displayID)) - continue; - - if ([[info objectForKey:@kDisplayProductID] unsignedIntValue] != CGDisplayModelNumber(displayID)) - continue; - - if ([[info objectForKey:@kDisplaySerialNumber] unsignedIntValue] != CGDisplaySerialNumber(displayID)) - continue; - - NSDictionary *localizedNames = [info objectForKey:@kDisplayProductName]; - if (![localizedNames count]) - break; // Correct screen, but no name in dictionary - - return QString::fromNSString([localizedNames objectForKey:[[localizedNames allKeys] objectAtIndex:0]]); - } - - return QString(); -} - void QCocoaScreen::update(CGDirectDisplayID displayId) { if (displayId != m_displayId) { @@ -274,11 +242,7 @@ void QCocoaScreen::update(CGDirectDisplayID displayId) float refresh = CGDisplayModeGetRefreshRate(displayMode); m_refreshRate = refresh > 0 ? refresh : 60.0; m_rotation = CGDisplayRotation(displayId); - - if (@available(macOS 10.15, *)) - m_name = QString::fromNSString(nsScreen.localizedName); - else - m_name = displayName(m_displayId); + m_name = QString::fromNSString(nsScreen.localizedName); const bool didChangeGeometry = m_geometry != previousGeometry || m_availableGeometry != previousAvailableGeometry;