diff options
| author | con <qtc-committer@nokia.com> | 2011-06-28 07:30:20 (GMT) |
|---|---|---|
| committer | con <qtc-committer@nokia.com> | 2011-06-28 07:46:32 (GMT) |
| commit | 604279b4dd0a01256f7a06fa3578a3c1dc225134 (patch) | |
| tree | cb02a96968b321d02e1246c8ddd17dacec1d8b11 | |
| parent | f4021929ef802a5b5093a03c37f5f1b8021b46e7 (diff) | |
| download | Qt-604279b4dd0a01256f7a06fa3578a3c1dc225134.zip Qt-604279b4dd0a01256f7a06fa3578a3c1dc225134.tar.gz Qt-604279b4dd0a01256f7a06fa3578a3c1dc225134.tar.bz2 | |
Fix 2cb398e1d901e62384bb2b388761cfd18fc8804a in case of no coreservices
Reviewed-by: Ritt Konstantin <ritt.ks@gmail.com>
| -rw-r--r-- | src/corelib/kernel/qcore_mac.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/kernel/qcore_mac_p.h | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/corelib/kernel/qcore_mac.cpp b/src/corelib/kernel/qcore_mac.cpp index e705c31..490031f 100644 --- a/src/corelib/kernel/qcore_mac.cpp +++ b/src/corelib/kernel/qcore_mac.cpp @@ -87,6 +87,7 @@ QCFString::operator CFStringRef() const } +#ifndef QT_NO_CORESERVICES void qt_mac_to_pascal_string(const QString &s, Str255 str, TextEncoding encoding, int len) { if(len == -1) @@ -135,5 +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 QT_END_NAMESPACE diff --git a/src/corelib/kernel/qcore_mac_p.h b/src/corelib/kernel/qcore_mac_p.h index 4b8c16f..df269ec 100644 --- a/src/corelib/kernel/qcore_mac_p.h +++ b/src/corelib/kernel/qcore_mac_p.h @@ -148,12 +148,15 @@ private: QString string; }; + +#ifndef QT_NO_CORESERVICES 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 QT_END_NAMESPACE |