diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-25 10:43:32 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-25 10:43:32 (GMT) |
| commit | ad365cf942e339271706554ac86319d99538bad9 (patch) | |
| tree | 3bb9a494e9af7b7adb180b309e7b9c9233203325 /src/3rdparty | |
| parent | e0941463665d51dfe7f9b1adf13611be303fd841 (diff) | |
| parent | 985738bcc2e690c4b02e132dce829768fab0ed76 (diff) | |
| download | Qt-ad365cf942e339271706554ac86319d99538bad9.zip Qt-ad365cf942e339271706554ac86319d99538bad9.tar.gz Qt-ad365cf942e339271706554ac86319d99538bad9.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
Check engine existence before increasing reference count
Keep reference count for cached font engines in QTextEngine
Fixes: missing export of gzungetc() from internal zlib
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/zlib/zlib.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/zlib/zlib.h b/src/3rdparty/zlib/zlib.h index 9e5b467..bdb9a3d 100644 --- a/src/3rdparty/zlib/zlib.h +++ b/src/3rdparty/zlib/zlib.h @@ -1171,7 +1171,7 @@ ZEXTERN int Q_ZEXPORT gzgetc OF((gzFile file)); or -1 in case of end of file or error. */ -ZEXTERN int ZEXPORT gzungetc OF((int c, gzFile file)); +ZEXTERN int Q_ZEXPORT gzungetc OF((int c, gzFile file)); /* Push one character back onto the stream to be read again later. Only one character of push-back is allowed. gzungetc() returns the |