diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-07 14:41:20 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-07 14:41:20 (GMT) |
| commit | 18ba5b93367ada2f6f3ce2c6b7947367963421f0 (patch) | |
| tree | 2051e2eeac21a46c3de82159d0282b203703e1f9 | |
| parent | c70ac02cbc4694208e0cbcb469b0a0d0a64b67e9 (diff) | |
| parent | e5e15f366f60968cdb511feb5681cb33fc10ea44 (diff) | |
| download | Qt-18ba5b93367ada2f6f3ce2c6b7947367963421f0.zip Qt-18ba5b93367ada2f6f3ce2c6b7947367963421f0.tar.gz Qt-18ba5b93367ada2f6f3ce2c6b7947367963421f0.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Do not > /dev/null gdb output.
Remove unused local variable in myanmar shaper of harfbuzz
| -rw-r--r-- | mkspecs/features/unix/gdb_dwarf_index.prf | 2 | ||||
| -rw-r--r-- | src/3rdparty/harfbuzz/src/harfbuzz-myanmar.c | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/mkspecs/features/unix/gdb_dwarf_index.prf b/mkspecs/features/unix/gdb_dwarf_index.prf index 7c0ca2f..264edc2 100644 --- a/mkspecs/features/unix/gdb_dwarf_index.prf +++ b/mkspecs/features/unix/gdb_dwarf_index.prf @@ -1,7 +1,7 @@ !CONFIG(separate_debug_info):CONFIG(debug, debug|release):!staticlib:!static:!contains(TEMPLATE, subdirs):!isEmpty(QMAKE_OBJCOPY) { QMAKE_GDB_INDEX = { test -z \"$(DESTDIR)\" || cd \"$(DESTDIR)\"; } && \ - gdb -silent -ex \'set confirm off\' -ex \'save gdb-index .\' -ex quit \'$(TARGET)\' >/dev/null 2>&1 && \ + gdb --nx --batch --quiet -ex \'set confirm off\' -ex \'save gdb-index .\' -ex quit \'$(TARGET)\' && \ test -f $(TARGET).gdb-index && \ $$QMAKE_OBJCOPY --add-section \'.gdb_index=$(TARGET).gdb-index\' --set-section-flags \'.gdb_index=readonly\' \'$(TARGET)\' \'$(TARGET)\' && \ $$QMAKE_DEL_FILE $(TARGET).gdb-index || true diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-myanmar.c b/src/3rdparty/harfbuzz/src/harfbuzz-myanmar.c index 7cd82bb..4b68e64 100644 --- a/src/3rdparty/harfbuzz/src/harfbuzz-myanmar.c +++ b/src/3rdparty/harfbuzz/src/harfbuzz-myanmar.c @@ -424,12 +424,8 @@ static HB_Bool myanmar_shape_syllable(HB_Bool openType, HB_ShaperItem *item, HB_ #ifndef NO_OPENTYPE if (openType) { - unsigned short logClusters[32]; hb_uint32 where[32]; - for (i = 0; i < len; ++i) - logClusters[i] = i; - for (i = 0; i < len; ++i) { where[i] = ~(PreSubstProperty | BelowSubstProperty |