diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-14 19:51:52 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-14 19:51:52 (GMT) |
| commit | 55de2bd842a43e84f7bd3efb2cbc5d71640fbda4 (patch) | |
| tree | d5b3689141cd82704977b34ee4e5cfd5d37809fa /qmake/Makefile.unix | |
| parent | 9dcf1eabc373991340b0c0b697f5b0788fde4f4b (diff) | |
| parent | 840bcb0b56b5b96a81fe3d1d5d91e1477e0fa387 (diff) | |
| download | Qt-55de2bd842a43e84f7bd3efb2cbc5d71640fbda4.zip Qt-55de2bd842a43e84f7bd3efb2cbc5d71640fbda4.tar.gz Qt-55de2bd842a43e84f7bd3efb2cbc5d71640fbda4.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:
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( be2489a618c909c4a82d927f9fff9d12feafeb30 )
QtScript: Add tests for translation of multiple scripts
QtScript: Add test for translation disambiguation
QtScript: Fix call stack issue with qsTr() when JIT is enabled
Diffstat (limited to 'qmake/Makefile.unix')
0 files changed, 0 insertions, 0 deletions