summaryrefslogtreecommitdiffstats
path: root/tests/auto/qstatemachine
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-03-22 12:44:53 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-03-22 12:44:53 (GMT)
commit4b40231458a6df067e74047842073a445880b686 (patch)
tree7d4d551db89aa2aef934376ffc4eeabd6541f776 /tests/auto/qstatemachine
parent790f0cdab732eaecb9aaeb3a7873473c829ee34d (diff)
parent22993cbada46fb9e170d4ac7a08413c968fce2a2 (diff)
downloadQt-4b40231458a6df067e74047842073a445880b686.zip
Qt-4b40231458a6df067e74047842073a445880b686.tar.gz
Qt-4b40231458a6df067e74047842073a445880b686.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: Stop QHostInfo thread pool when application is about to exit Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( d95c54951e7af2aa7def4346a142b2162bd89bbd )
Diffstat (limited to 'tests/auto/qstatemachine')
0 files changed, 0 insertions, 0 deletions