Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Wed, 11 Aug 2010 02:02:02 +0000 (04:02 +0200)
committerQt Continuous Integration System <qt-info@nokia.com>
Wed, 11 Aug 2010 02:02:02 +0000 (04:02 +0200)
commit8dca92fd7987a9aa727dea6c367c079a39668f09
tree3936623d671e741d95c4dcb33e7ce0ee2f9f8a74
parent0bd5f5969c556f89bf146211772a315f25a23e99
parent87c62128266a4e2289c1854e35aba3fc17d44045
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  QSslSocket: fix security vulnerability with wildcard IP addresses
  fix build for -no-qt3support
  Fix handling of SSL certificates with wildcard domain names