summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2010-06-16 07:57:24 (GMT)
committerSimon Hausmann <simon.hausmann@nokia.com>2010-06-16 07:57:24 (GMT)
commit07a902000950a4aa6eebf2072afb83eee3eb3d5f (patch)
tree13569042bb9e884f538954394441c54c127129f0 /src/3rdparty
parent277339cdcb5e0adac6ff669745a5390f2bf089b2 (diff)
downloadQt-07a902000950a4aa6eebf2072afb83eee3eb3d5f.zip
Qt-07a902000950a4aa6eebf2072afb83eee3eb3d5f.tar.gz
Qt-07a902000950a4aa6eebf2072afb83eee3eb3d5f.tar.bz2
Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to 5e9b2a88688f6e360d7db00bc86a45bf2cf86e52
Includes Andreas' MSVC fix and fixes the RVCT build by temporarily disabling the structure packing.
Diffstat (limited to 'src/3rdparty')
-rw-r--r--src/3rdparty/harfbuzz/src/harfbuzz-global.h2
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