summaryrefslogtreecommitdiffstats
path: root/src/network/ssl/qsslcipher.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-03-19 04:36:51 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-03-19 04:36:51 (GMT)
commit86ceda033eda6bd615134f71b9850081a0c808c9 (patch)
treedd4506f056f234e04ea66e0c4a8eeae23d389cda /src/network/ssl/qsslcipher.cpp
parenteaa1ba18e1db380bcacff1b7c41212a910da0550 (diff)
parentf9815142befe5fb312a6fea1dac43c33a3189145 (diff)
downloadQt-86ceda033eda6bd615134f71b9850081a0c808c9.zip
Qt-86ceda033eda6bd615134f71b9850081a0c808c9.tar.gz
Qt-86ceda033eda6bd615134f71b9850081a0c808c9.tar.bz2
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: Changes to driver workarounds. Switch to raster also when last window is destroyed (on MeeGo). Fix accidental population of the disk cache with partial content Fix disk cache interaction for range retrieval HTTP requests. Clipboard/Windows: Fix a hang when sending to non-responsive clients.
Diffstat (limited to 'src/network/ssl/qsslcipher.cpp')
0 files changed, 0 insertions, 0 deletions