diff --git src/corelib/kernel/qcore_foundation.mm src/corelib/kernel/qcore_foundation.mm
index 56eabc4b8c80d09d5f34eef49ca83da0c05906a3..1f90be956a96ee097937da61e2f8423a56476064 100644
|
|
QTimeZone QTimeZone::fromNSTimeZone(const NSTimeZone *timeZone) |
488 | 488 | */ |
489 | 489 | NSTimeZone *QTimeZone::toNSTimeZone() const |
490 | 490 | { |
491 | | return [static_cast<NSTimeZone *>(toCFTimeZone()) autorelease]; |
| 491 | return [(NSTimeZone *)(toCFTimeZone()) autorelease]; |
492 | 492 | } |
493 | 493 | #endif |
494 | 494 | |
diff --git src/corelib/io/qfilesystemengine_unix.cpp src/corelib/io/qfilesystemengine_unix.cpp
index 7fed54f..f89b21f 100644
|
|
static bool isPackage(const QFileSystemMetaData &data, const QFileSystemEntry &e |
126 | 126 | |
127 | 127 | #ifdef Q_OS_MACOS |
128 | 128 | // Find if an application other than Finder claims to know how to handle the package |
129 | | QCFType<CFURLRef> application = LSCopyDefaultApplicationURLForURL(url, |
| 129 | #if QT_MAC_DEPLOYMENT_TARGET_BELOW(__MAC_10_10, __IPHONE_NA) |
| 130 | CFURLRef application = nullptr; |
| 131 | if (LSGetApplicationForURL(url, kLSRolesEditor | kLSRolesViewer, NULL, &application) != noErr) { |
| 132 | application = nullptr; |
| 133 | } |
| 134 | #else |
| 135 | CFURLRef application = LSCopyDefaultApplicationURLForURL(url, |
130 | 136 | kLSRolesEditor | kLSRolesViewer, nullptr); |
| 137 | #endif |
131 | 138 | |
132 | 139 | if (application) { |
133 | 140 | QCFType<CFBundleRef> bundle = CFBundleCreate(kCFAllocatorDefault, application); |
| 141 | CFRelease(application); |
134 | 142 | CFStringRef identifier = CFBundleGetIdentifier(bundle); |
135 | 143 | QString applicationId = QString::fromCFString(identifier); |
136 | 144 | if (applicationId != QLatin1String("com.apple.finder")) |