diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-22 06:41:32 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-22 06:41:32 (GMT) |
| commit | e6f156d9172a21236950885ff94b9838cfb58912 (patch) | |
| tree | 094595385a5fd2823596358f5b38c20a582f925a /src/qt_targets.pri | |
| parent | 5238e6a592c43f19a7151d20e36908f1f1a44df8 (diff) | |
| parent | 74d58874e5608190890c1e830fecba1951ea9afe (diff) | |
| download | Qt-e6f156d9172a21236950885ff94b9838cfb58912.zip Qt-e6f156d9172a21236950885ff94b9838cfb58912.tar.gz Qt-e6f156d9172a21236950885ff94b9838cfb58912.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix null HB_Device** dereference on exit in Harfbuzz GPOS code
Prevent warnings about EPOCROOT coming out when not on symbian
Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to ab9a897b688e991a8405cf938dea9d6a2f1ac072
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( be1a105be93d7fcbe36d93d0827dc6e98b55de0c )
Diffstat (limited to 'src/qt_targets.pri')
0 files changed, 0 insertions, 0 deletions