diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-09 21:54:18 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-09 21:54:18 +1000 |
| commit | e8aceff19523a2fb048690798d789f0ec248696d (patch) | |
| tree | 2304fe2216d6fc4ebbeb6bad9cfdbe3fb24876c2 /doc/src/snippets/code/doc_src_resources.cpp | |
| parent | 38644abb0d15188e2f79f323ba091328aa0bd4ba (diff) | |
| parent | 939886720920f907884b8b32bf501354ed805857 (diff) | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-staging:
Skip test on MacOS due to problems with corewlan plugin
Fix QNetworkConfigurationManager usage outside main thread first
Update QTBUG-17223 for Qt 4.8
fix tst_qnetworkreply::httpProxyCommands autotest
Send User-Agent from the network request in http proxy CONNECT command
Add autotests for configuration dependent network proxies
Fix QNetworkReplyImpl error handling
Enable per network configuration proxy settings in QNetworkAccessManager
Allow a network configuration to be included in a proxy query
Fix error handling in write for socks socket engine
Diffstat (limited to 'doc/src/snippets/code/doc_src_resources.cpp')
0 files changed, 0 insertions, 0 deletions