diff options
| author | Ian Dean <ian@mediator-software.com> | 2012-07-18 23:02:56 -0700 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-18 11:09:00 +0200 |
| commit | b3c21d93f66617b87b341911d329c0b1ad6af485 (patch) | |
| tree | aee75fa9e661cc33916b3ef6c01de7217a8b4676 /src/corelib/kernel | |
| parent | c14694621aab2e7df13830f80621fb5680b432e4 (diff) | |
Refactor coreservices -> ios & QT_NO_CORESERVICES -> Q_OS_IOS
Similar work was done in Qt5 in Change Id3b02316
Change-Id: I392d2a5bfffb9a335f28d5dbc5ea27b800fc4487
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Diffstat (limited to 'src/corelib/kernel')
| -rw-r--r-- | src/corelib/kernel/qcore_mac.cpp | 4 | ||||
| -rw-r--r-- | src/corelib/kernel/qcore_mac_p.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/corelib/kernel/qcore_mac.cpp b/src/corelib/kernel/qcore_mac.cpp index cf2730b264..25170d5287 100644 --- a/src/corelib/kernel/qcore_mac.cpp +++ b/src/corelib/kernel/qcore_mac.cpp @@ -87,7 +87,7 @@ QCFString::operator CFStringRef() const } -#ifndef QT_NO_CORESERVICES +#if !defined(Q_OS_IOS) void qt_mac_to_pascal_string(const QString &s, Str255 str, TextEncoding encoding, int len) { if(len == -1) @@ -136,6 +136,6 @@ OSErr qt_mac_create_fsspec(const QString &file, FSSpec *spec) ret = FSGetCatalogInfo(&fsref, kFSCatInfoNone, 0, 0, spec, 0); return ret; } -#endif // QT_NO_CORESERVICES +#endif // !defined(Q_OS_IOS) QT_END_NAMESPACE diff --git a/src/corelib/kernel/qcore_mac_p.h b/src/corelib/kernel/qcore_mac_p.h index 0124ee9e10..df579cd10c 100644 --- a/src/corelib/kernel/qcore_mac_p.h +++ b/src/corelib/kernel/qcore_mac_p.h @@ -74,7 +74,7 @@ #include <CoreFoundation/CoreFoundation.h> #endif -#ifndef QT_NO_CORESERVICES +#if !defined(Q_OS_IOS) #include <CoreServices/CoreServices.h> #endif @@ -149,14 +149,14 @@ private: }; -#ifndef QT_NO_CORESERVICES +#if !defined(Q_OS_IOS) Q_CORE_EXPORT void qt_mac_to_pascal_string(const QString &s, Str255 str, TextEncoding encoding = 0, int len = -1); Q_CORE_EXPORT QString qt_mac_from_pascal_string(const Str255 pstr); Q_CORE_EXPORT OSErr qt_mac_create_fsref(const QString &file, FSRef *fsref); // Don't use this function, it won't work in 10.5 (Leopard) and up Q_CORE_EXPORT OSErr qt_mac_create_fsspec(const QString &file, FSSpec *spec); -#endif // QT_NO_CORESERVICES +#endif // !defined(Q_OS_IOS) QT_END_NAMESPACE |