Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into master-integ...
authorQt Continuous Integration System <qt-info@nokia.com>
Thu, 6 Oct 2011 18:28:42 +0000 (04:28 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 6 Oct 2011 18:28:42 +0000 (04:28 +1000)
commit55ea900361418aed0c23c0f0023a88b022c2b55d
tree9ac915b17e36a591e6bdca39f74e391a155dbb0f
parent109ece623d8a973a2d97263309aa32bceab7e210
parent1ef309e964753105e14a8c223a1b59c0cbd9369b
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging:
  Fix QSysInfo::WindowsVersion checking (QSysInfo::WV_NT_based is a mask)
  QHostInfo: fix a race condition under CE