diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-13 23:58:51 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-13 23:58:51 (GMT) |
| commit | 96b54a00927b398ec4372088a9fd57b7144e393b (patch) | |
| tree | 2ce28cc838c8e73d16334a131b0716141d4fcaf1 /doc/src/snippets/sqldatabase/sqldatabase.pro | |
| parent | 4f2538b2785e19f391ecdb9694970d3cae3c835f (diff) | |
| parent | 4d0cd05e98c3e83a4d1871c139cd8b4a2a86e988 (diff) | |
| download | Qt-96b54a00927b398ec4372088a9fd57b7144e393b.zip Qt-96b54a00927b398ec4372088a9fd57b7144e393b.tar.gz Qt-96b54a00927b398ec4372088a9fd57b7144e393b.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix system proxy test: QNetworkProxyFactory::systemProxyForQuery() is static
QNetworkProxyFactory::systemProxyForQuery() for Symbian
Diffstat (limited to 'doc/src/snippets/sqldatabase/sqldatabase.pro')
0 files changed, 0 insertions, 0 deletions