diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-24 09:15:12 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-24 09:15:12 (GMT) |
| commit | 8d05bd74dcf13045a009bfd2008795f901b74fa8 (patch) | |
| tree | 8b87b897ecdc09676c60c31d8d05a31c938e5dfc | |
| parent | f11568e805def983af96b6e697094df1fb96af15 (diff) | |
| parent | 9f7a9b1272357a06cd721d64e66fcde1921bd325 (diff) | |
| download | Qt-8d05bd74dcf13045a009bfd2008795f901b74fa8.zip Qt-8d05bd74dcf13045a009bfd2008795f901b74fa8.tar.gz Qt-8d05bd74dcf13045a009bfd2008795f901b74fa8.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to a80fd59e3b3b18116803a14e6369345933994236
| -rw-r--r-- | src/3rdparty/harfbuzz/src/harfbuzz-global.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-global.h b/src/3rdparty/harfbuzz/src/harfbuzz-global.h index 5b2b679..bccd6a2 100644 --- a/src/3rdparty/harfbuzz/src/harfbuzz-global.h +++ b/src/3rdparty/harfbuzz/src/harfbuzz-global.h @@ -39,7 +39,7 @@ #define HB_END_HEADER /* nothing */ #endif -#if defined(__GNUC__) || defined(__ARMCC__) || defined(__CC_ARM) || defined(_MSC_VER) +#if defined(__GNUC__) || defined(_MSC_VER) #define HB_USE_PACKED_STRUCTS #endif |