diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-29 08:02:38 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-29 08:02:38 (GMT) |
| commit | 6b3f2a3b96d01dc339d07a076300d29616603b28 (patch) | |
| tree | 1681542fa9b680811c84f0efa13502d848d58a4c /src/corelib/kernel | |
| parent | 9d6c186f418ea77f202404408aa6692805038bea (diff) | |
| parent | ba21727195a1e7a98c731d1357a00d7b7bc058b6 (diff) | |
| download | Qt-6b3f2a3b96d01dc339d07a076300d29616603b28.zip Qt-6b3f2a3b96d01dc339d07a076300d29616603b28.tar.gz Qt-6b3f2a3b96d01dc339d07a076300d29616603b28.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
Fix vertical positioning of glyphs in raster engine with FreeType
Ensure a small event check interval on uikit platform.
Change default application font for uikit platform.
Use the QPoint memory layout change only on Desktop Mac
Fix 2cb398e1d901e62384bb2b388761cfd18fc8804a in case of no coreservices
Add IPHONEOS deployment vars to makespec
Post key events via QWindowSystemInterface, don't post events direcly
Use nicer fonts and a few little patches to uikit platform.
Update README and qmlapplicationviewer to suit 4.8.
Updated proof-of-concept UIKit mkspecs
Diffstat (limited to 'src/corelib/kernel')
| -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 |