summaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-01-08 19:46:17 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-01-08 19:46:17 (GMT)
commit0cd3782fde0da7149771db1c97f1fa6f358564d4 (patch)
treeb2466b7c3f960e098a639bf0f1c9b7525a138f62 /util
parent4596db451cd2c53768e42b00a4234e7de2149f39 (diff)
parent5533c854c154ec39ecdf15734a5be090dba19d0e (diff)
downloadQt-0cd3782fde0da7149771db1c97f1fa6f358564d4.zip
Qt-0cd3782fde0da7149771db1c97f1fa6f358564d4.tar.gz
Qt-0cd3782fde0da7149771db1c97f1fa6f358564d4.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: Doc typos fixed Translations: Update German for 4.6.1 fix test under windows don't complain about unresolved base when the reference is absolute make the lupdate tests more verbose in case of failure don't use qmake for test setup move equivalent of output_ts test to good/ look for the .result file in the dir where the output is expected to go fix sametext and number heuristics fix number heuristics, part 1 no point in specifying -ts when a .pro file is specified clean up the lupdatecmd files tidy up the test .pro files remove dead code
Diffstat (limited to 'util')
0 files changed, 0 insertions, 0 deletions