diff options
| author | Jason Barron <jbarron@trolltech.com> | 2009-07-09 11:03:54 (GMT) |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2009-07-09 11:03:54 (GMT) |
| commit | 8bc84e2180e1d5819b372f4cd8c236b853145803 (patch) | |
| tree | 6c5e6a8b6a1750e2484fd34f48be662fcf51959f /src/3rdparty | |
| parent | d641198fa71fadd243e84dfdf02b9a0536a27b3f (diff) | |
| parent | 3b1e30bb1d6651a626aba1f6b8883f5524598ed3 (diff) | |
| download | Qt-8bc84e2180e1d5819b372f4cd8c236b853145803.zip Qt-8bc84e2180e1d5819b372f4cd8c236b853145803.tar.gz Qt-8bc84e2180e1d5819b372f4cd8c236b853145803.tar.bz2 | |
Merge commit 'origin/master' into 4.6-merged
Conflicts:
src/corelib/kernel/qcoreevent.cpp
src/corelib/tools/qdumper.cpp
src/gui/kernel/qwidget.cpp
src/gui/kernel/qwidget_p.h
src/gui/kernel/qwidget_s60.cpp
src/gui/text/qfontdatabase.cpp
src/network/access/qnetworkreplyimpl.cpp
src/sql/drivers/ibase/qsql_ibase.cpp
src/testlib/qtestcase.cpp
src/testlib/testlib.pro
tests/auto/network-settings.h
tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp
tests/auto/qobjectrace/tst_qobjectrace.cpp
tests/auto/qsqldatabase/tst_qsqldatabase.cpp
tools/configure/configureapp.cpp
translations/qt_ru.ts
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/harfbuzz/src/harfbuzz-gpos.c | 2 | ||||
| -rw-r--r-- | src/3rdparty/harfbuzz/src/harfbuzz-impl.c | 4 | ||||
| -rw-r--r-- | src/3rdparty/harfbuzz/src/harfbuzz-stream.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-gpos.c b/src/3rdparty/harfbuzz/src/harfbuzz-gpos.c index 1ac3779..c932ec2 100644 --- a/src/3rdparty/harfbuzz/src/harfbuzz-gpos.c +++ b/src/3rdparty/harfbuzz/src/harfbuzz-gpos.c @@ -2723,7 +2723,7 @@ static HB_Error Load_Mark2Array( HB_Mark2Array* m2a, { HB_Error error; - HB_UShort k, m, n, count; + HB_UShort m, n, count; HB_UInt cur_offset, new_offset, base_offset; HB_Mark2Record *m2r; diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-impl.c b/src/3rdparty/harfbuzz/src/harfbuzz-impl.c index 9056a55..ddbf36b 100644 --- a/src/3rdparty/harfbuzz/src/harfbuzz-impl.c +++ b/src/3rdparty/harfbuzz/src/harfbuzz-impl.c @@ -33,7 +33,7 @@ HB_INTERNAL HB_Pointer _hb_alloc(size_t size, HB_Error *perror ) { - HB_Error error = 0; + HB_Error error = (HB_Error)0; HB_Pointer block = NULL; if ( size > 0 ) @@ -54,7 +54,7 @@ _hb_realloc(HB_Pointer block, HB_Error *perror ) { HB_Pointer block2 = NULL; - HB_Error error = 0; + HB_Error error = (HB_Error)0; block2 = realloc( block, new_size ); if ( block2 == NULL && new_size != 0 ) diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-stream.c b/src/3rdparty/harfbuzz/src/harfbuzz-stream.c index 3dcee82..2d9638f 100644 --- a/src/3rdparty/harfbuzz/src/harfbuzz-stream.c +++ b/src/3rdparty/harfbuzz/src/harfbuzz-stream.c @@ -70,7 +70,7 @@ HB_INTERNAL HB_Error _hb_stream_seek( HB_Stream stream, HB_UInt pos ) { - HB_Error error = 0; + HB_Error error = (HB_Error)0; stream->pos = pos; if (pos > stream->size) |