diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-21 23:52:06 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-21 23:52:06 (GMT) |
| commit | c70e3f24a97b82f5ce9ad890fa95369e425a31ac (patch) | |
| tree | 432987220d2f7fa2b96a5307d0d8608e7eb184be /src/3rdparty | |
| parent | 07f131927faa09402589da7b4bfb516482f59e46 (diff) | |
| parent | c05f38f37fbe2192d135881de3dba087ac71ffe1 (diff) | |
| download | Qt-c70e3f24a97b82f5ce9ad890fa95369e425a31ac.zip Qt-c70e3f24a97b82f5ce9ad890fa95369e425a31ac.tar.gz Qt-c70e3f24a97b82f5ce9ad890fa95369e425a31ac.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Revert "Compile fix for MSVC"
Compile fix for MSVC
Improve QAccessible for QAccessibleTabBar
Improve QAccessible for QTabBar
fix the export macros for the QtDBus module
rebuild configure.exe
make "configure -qt-gif" work again on Windows
Fix a typo in harfbuzz thai line breaking.
Ensure that font sizes that are > 0 and < 1 are still respected
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/harfbuzz/src/harfbuzz-thai.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-thai.c b/src/3rdparty/harfbuzz/src/harfbuzz-thai.c index e153ba9..e80e2c5 100644 --- a/src/3rdparty/harfbuzz/src/harfbuzz-thai.c +++ b/src/3rdparty/harfbuzz/src/harfbuzz-thai.c @@ -91,7 +91,7 @@ static void thaiWordBreaks(const HB_UChar16 *string, hb_uint32 len, HB_CharAttri for (i = 0; i < numbreaks; ++i) { if (break_positions[i] > 0) { attributes[break_positions[i]-1].lineBreakType = HB_Break; - attributes[i].wordBoundary = TRUE; + attributes[break_positions[i]-1].wordBoundary = TRUE; } } |