diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-13 13:02:58 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-13 13:02:58 (GMT) |
commit | e1b03bac22f87edbbe78eba366966259be6eb0ed (patch) | |
tree | 90d6aaa0557aa36007867aeb65839a9954622bcc /src/corelib/codecs/qtextcodec.h | |
parent | 5099edac8485e41ed4187fc18a42cbfc2bc43023 (diff) | |
parent | 3aca005d4721b82446922310496271ebe206a0d7 (diff) | |
download | Qt-e1b03bac22f87edbbe78eba366966259be6eb0ed.zip Qt-e1b03bac22f87edbbe78eba366966259be6eb0ed.tar.gz Qt-e1b03bac22f87edbbe78eba366966259be6eb0ed.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: (22 commits)
really, *really* fix the test :}
QFile cannot deal with crlf-translated stdio, so use binary mode
remove trimming of (expected) output
really fix the autotest
support regexp-like quantifiers of expected output lines
remove superfluous \r filtering
print actual rather than expected output for matching text
Do not set the font size unnecessarily in the simulated s60 style.
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
...
Diffstat (limited to 'src/corelib/codecs/qtextcodec.h')
0 files changed, 0 insertions, 0 deletions