diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-19 17:41:32 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-19 17:41:32 (GMT) |
| commit | 530c0a32bf58b382c32806bb6742b6029086c92e (patch) | |
| tree | 5313649cf6f5cac76f4aad58f312204124d9ce6f /src/3rdparty/harfbuzz/src/harfbuzz-gdef.h | |
| parent | 8989702bbe666f67b3bd24753414450dee4688e8 (diff) | |
| parent | 83525ca84ba7adadaeeb65ffa55a6d0f2630caaa (diff) | |
| download | Qt-530c0a32bf58b382c32806bb6742b6029086c92e.zip Qt-530c0a32bf58b382c32806bb6742b6029086c92e.tar.gz Qt-530c0a32bf58b382c32806bb6742b6029086c92e.tar.bz2 | |
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (58 commits)
Fine-tune the tests being run on the CI system.
Standardize selection color in visual test
Use GLIBC functions on any GLIBC architecture.
tst_qnetworkreply: Fix ugly test
Fix license text.
Remove pointSize from visual tests
Update visuals for X11
Doc: fix a typo in QML/Qt UI integration
Added missing symbols in QtCore and QtGui def files needed by fix made to QT-4077
Fix regression due to 6cf397f7ac35a058096528a7ad8bfaf623b30747
Remove some excess pngs
Update qml visual tests
VisualDataModel::count should be 0 until a valid delegate is set.
Doc: Remove default from PathView path property
Record images on more than just the first frame.
Turn off font antialiasing during tests.
Shrink size of a visual test
doc: Fix documentation of QTextEdit::setDocument
Fixed QGesture autotest for QGesture lazy deletion.
compile with quintptr instead of intptr_t
...
Diffstat (limited to 'src/3rdparty/harfbuzz/src/harfbuzz-gdef.h')
| -rw-r--r-- | src/3rdparty/harfbuzz/src/harfbuzz-gdef.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-gdef.h b/src/3rdparty/harfbuzz/src/harfbuzz-gdef.h index f9a03dd..ccb6bf9 100644 --- a/src/3rdparty/harfbuzz/src/harfbuzz-gdef.h +++ b/src/3rdparty/harfbuzz/src/harfbuzz-gdef.h @@ -31,10 +31,6 @@ HB_BEGIN_HEADER -#ifdef HB_USE_PACKED_STRUCTS -#pragma pack(push, 1) -#endif - /* GDEF glyph properties. Note that HB_GDEF_COMPONENT has no corresponding * flag in the LookupFlag field. */ #define HB_GDEF_BASE_GLYPH 0x0002 @@ -131,10 +127,6 @@ HB_Error HB_GDEF_Build_ClassDefinition( HB_GDEFHeader* gdef, HB_UShort* glyph_array, HB_UShort* class_array ); -#ifdef HB_USE_PACKED_STRUCTS -#pragma pack(pop) -#endif - HB_END_HEADER #endif /* HARFBUZZ_GDEF_H */ |