diff options
| author | Jake Petroules <jake.petroules@theqtcompany.com> | 2015-09-06 15:29:37 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@theqtcompany.com> | 2015-09-22 01:58:41 +0000 |
| commit | dc1bf3008e747e12922281c81a0a46775f65880b (patch) | |
| tree | c2c4c746b5e80498f2ed6a6a2e301d4b60a59a6f /src/corelib/global/qglobal.cpp | |
| parent | 46a372e1a115fb05b746339c790a7f3e5d6d01fc (diff) | |
Clean up some Apple-related includes and declarations.
Change-Id: I92db9691c2243ae72ecd4e11dd4640afaf4bf822
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
Diffstat (limited to 'src/corelib/global/qglobal.cpp')
| -rw-r--r-- | src/corelib/global/qglobal.cpp | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index f0208846aa..7da9713e80 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -83,10 +83,6 @@ using namespace ABI::Windows::Networking::Sockets; # include <envLib.h> #endif -#if defined(Q_OS_MACX) -#include <CoreServices/CoreServices.h> -#endif - #if defined(Q_OS_ANDROID) && !defined(Q_OS_ANDROID_NO_SDK) #include <private/qjni_p.h> #endif @@ -1865,25 +1861,6 @@ QT_BEGIN_INCLUDE_NAMESPACE #include "qnamespace.h" QT_END_INCLUDE_NAMESPACE -#if defined(Q_OS_OSX) - -Q_CORE_EXPORT OSErr qt_mac_create_fsref(const QString &file, FSRef *fsref) -{ - return FSPathMakeRef(reinterpret_cast<const UInt8 *>(file.toUtf8().constData()), fsref, 0); -} - -Q_CORE_EXPORT void qt_mac_to_pascal_string(QString s, Str255 str, TextEncoding encoding=0, int len=-1) -{ - Q_UNUSED(encoding); - Q_UNUSED(len); - CFStringGetPascalString(QCFString(s), str, 256, CFStringGetSystemEncoding()); -} - -Q_CORE_EXPORT QString qt_mac_from_pascal_string(const Str255 pstr) { - return QCFString(CFStringCreateWithPascalString(0, pstr, CFStringGetSystemEncoding())); -} -#endif // defined(Q_OS_OSX) - QSysInfo::MacVersion QSysInfo::macVersion() { const QAppleOperatingSystemVersion version = qt_apple_os_version(); // qtcore_mac_objc.mm |