Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into master-integ...
authorQt Continuous Integration System <qt-info@nokia.com>
Fri, 8 Apr 2011 08:46:18 +0000 (18:46 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 8 Apr 2011 08:46:18 +0000 (18:46 +1000)
commit02fcd5e346da13cbb65523de2348880cf7d7a073
treeb125e523779c96d5cf4f2ec94eedfc71d398b3ea
parent4d3d0aaf7de3e92fe77ac69f0268d2e03c6f41cc
parent4e9eb911ffc70959d81de01fe9fe4a704cafe3eb
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 QLocalSocket::isValid() on Windows