summaryrefslogtreecommitdiffstats
path: root/examples/script
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-06-15 00:47:53 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-06-15 00:47:53 (GMT)
commit40aafa7e692bcb8f62ab564cfb5571685671f70b (patch)
tree52601fc0df9d0c6823050f31569c8f8173a23615 /examples/script
parent192ed507cdb16125d2cdcaff63b1591c0d6b4596 (diff)
parent08d1b0ab26dea5749461a988e6168f9dea6081f3 (diff)
downloadQt-40aafa7e692bcb8f62ab564cfb5571685671f70b.zip
Qt-40aafa7e692bcb8f62ab564cfb5571685671f70b.tar.gz
Qt-40aafa7e692bcb8f62ab564cfb5571685671f70b.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: Revert "QFileInfoGatherer: call QFileSystemWatcher addPaths from proper thread" QFileInfoGatherer: call QFileSystemWatcher addPaths from proper thread Also test http proxy in the QTcpServer benchmark Symbian QFileSystemWatcher: fix potential crash Enable QTcpServer benchmark on symbian
Diffstat (limited to 'examples/script')
0 files changed, 0 insertions, 0 deletions