diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-03 03:30:37 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-03 03:30:37 (GMT) |
commit | 0d9ff247db8ca64e0dcfd0ea05c3a615abab845b (patch) | |
tree | 9029c443bfa3612a488d1432d3defb3bda380d5a /tools/kmap2qmap | |
parent | a4ac042461bdb019433aa4e2d04a6be1c5f29591 (diff) | |
parent | 9647dfb6d363812c59bd7ffb2a6c4ee2a34035ce (diff) | |
download | Qt-0d9ff247db8ca64e0dcfd0ea05c3a615abab845b.zip Qt-0d9ff247db8ca64e0dcfd0ea05c3a615abab845b.tar.gz Qt-0d9ff247db8ca64e0dcfd0ea05c3a615abab845b.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 license headers on these new files (and the generator).
Add auto-generated tests for QScriptValue
Add changes for 4.6.2
Changelog: Added Designer/uic3 changes for 4.6.2
Revert "Improve raster graphics system performance on Mac."
Introduce of QScriptValue autotest generator.
Fixed potential crash in mac style
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 69dd29fbeb12d076741dce70ac6bc155101ccd6f )
Remove PrintDialog frame on Mac
Fix missing non-unified toolbar margins on Mac
Add a warning when there are duplicate aliases in a resource file.
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( a733444d3be6605552471f047558927495ff62b7 )
Improve raster graphics system performance on Mac.
Fixed compile of framecapture, simpleselector for symbian-abld winscw.
Diffstat (limited to 'tools/kmap2qmap')
0 files changed, 0 insertions, 0 deletions