summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-05-10 12:35:12 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-05-10 12:35:12 (GMT)
commit1a742a039802b32cfe2a92d8ef1a04c3a21a964f (patch)
tree1e5e1681a4bee917c06878a5bd35ca53e6ddae51 /src/gui
parentf3ddd2d995b7485cdc1c3420d254499904ff9dd9 (diff)
parent84cf56543c3e9add4f06ed65cf419561117ee739 (diff)
downloadQt-1a742a039802b32cfe2a92d8ef1a04c3a21a964f.zip
Qt-1a742a039802b32cfe2a92d8ef1a04c3a21a964f.tar.gz
Qt-1a742a039802b32cfe2a92d8ef1a04c3a21a964f.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: update def files Sockets: Fix potential null pointer usages Update QTBUG-17223 for Qt 4.8 fix tst_qnetworkreply::httpProxyCommands autotest Send User-Agent from the network request in http proxy CONNECT command Fix spelling mistake Fix crash when QSocketNotifier used with an invalid descriptor 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 Optimisation - buffer packet read in pendingDatagramSize Fix error handling in write for socks socket engine Remove warnings when disabling notifications on a closed socket Fix some warnings in symbian network tests
Diffstat (limited to 'src/gui')
0 files changed, 0 insertions, 0 deletions