projects / profile / ivi / qtbase.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: acc98b9 df2d675)
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)
* '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.


Trivial merge
Domain: UI Framework / Uncategorized;