Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
authorQt Continuous Integration System <qt-info@nokia.com>
Fri, 20 May 2011 09:18:56 +0000 (19:18 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 20 May 2011 09:18:56 +0000 (19:18 +1000)
commit4bd181fb5abc4c85e4f097262d36a409258b1561
tree802b6ef18d4cd23eadda9e41d0988b69e0118590
parentacc98b9b36c61bb661701cd98d70d2ebae4ee2f6
parentdf2d6753acff2dde79f99effc1a779f5c7f0a2c0
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  tst_qhostinfo: Fix IPv6 lookup detection on Windows.
  Fix incorrect hardware address on systems without getifaddrs()
  Make QHostAddress.toString() follow RFC-5952 for IPv6 address format.