diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-15 10:47:53 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-15 10:47:53 +1000 |
| commit | 40aafa7e692bcb8f62ab564cfb5571685671f70b (patch) | |
| tree | 52601fc0df9d0c6823050f31569c8f8173a23615 /doc/src/snippets/code/src_sql_kernel_qsqldatabase.cpp | |
| parent | 192ed507cdb16125d2cdcaff63b1591c0d6b4596 (diff) | |
| parent | 08d1b0ab26dea5749461a988e6168f9dea6081f3 (diff) | |
| download | qt4-tools-40aafa7e692bcb8f62ab564cfb5571685671f70b.tar.gz | |
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 'doc/src/snippets/code/src_sql_kernel_qsqldatabase.cpp')
0 files changed, 0 insertions, 0 deletions