Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Thu, 25 Nov 2010 04:35:03 +0000 (05:35 +0100)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 25 Nov 2010 04:35:03 +0000 (05:35 +0100)
commit062e4383c3b8c7c93e62ad564c47826369aa8a33
tree69a4669eafc57624eb161615738a5b1316aec76a
parentcb34d11e4c98e768432e00c867b3321d3b89dd9d
parent59f7146621f23def653629d00a5d4f42c9ddb0da
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 a missing error-signal when a server is shut down while downloading
  Ensure that if this is does not have a valid filter when on XP or less
  HTTP backend: fix build without Qt3 support
  QNetworkAccessManager: enable synchronous HTTP calls