diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-01 16:24:06 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-01 16:24:06 (GMT) |
| commit | 33a23c485fb11cad5442966faf02672b2411ff29 (patch) | |
| tree | 25336d562e95ad4403cb3a801aa1e4d87fdbd812 /src/gui/embedded | |
| parent | 4bc5082073ef64f5e1cf120eb5190ca0f5dad268 (diff) | |
| parent | ec0e7625b150e5626e687335228a40683da45a5a (diff) | |
| download | Qt-33a23c485fb11cad5442966faf02672b2411ff29.zip Qt-33a23c485fb11cad5442966faf02672b2411ff29.tar.gz Qt-33a23c485fb11cad5442966faf02672b2411ff29.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:
Update the scrolling code of FlickCharm
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 70b5989bdeea2f73bd950099fc0f0e954550ef54 )
Symbian build fix
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( c07df5686b431aa5d11643d00308d8f8f59d88b1 )
For maemo, do not strip the binaries during the installation.
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( eb1c86da9f5fa43a0e126ef58ab11cbd4d200af7 )
Diffstat (limited to 'src/gui/embedded')
0 files changed, 0 insertions, 0 deletions