diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-16 08:59:43 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-16 08:59:43 (GMT) |
commit | 64e1f888586f2c988b08bcc93579990e970b7206 (patch) | |
tree | 57ac2bb3463c68e7f25712e082f1a78cc90ee081 /src/corelib/io/qdatastream.cpp | |
parent | bf6ddf2631fbad3b7f1bac6469771910451bf84d (diff) | |
parent | 0ef5464cc2c79d834f565153111d48ae63249b97 (diff) | |
download | Qt-64e1f888586f2c988b08bcc93579990e970b7206.zip Qt-64e1f888586f2c988b08bcc93579990e970b7206.tar.gz Qt-64e1f888586f2c988b08bcc93579990e970b7206.tar.bz2 |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Satisfy the maketestselftest autotst
Make the lancelot/baseline test system generically usable
Make protocol less lancelot-specific, prepare use in other testcases
Added new View command on reports
Avoid race condition: don't quit until new executable is ready
Diffstat (limited to 'src/corelib/io/qdatastream.cpp')
0 files changed, 0 insertions, 0 deletions