projects / qt:qt.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f50a255 3b7b05c)
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integ...
authorQt Continuous Integration System <qt-info@nokia.com>
Wed, 18 May 2011 18:58:55 +0000 (04:58 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Wed, 18 May 2011 18:58:55 +0000 (04:58 +1000)
commit35b5f15c3fe5c2f1f0d046d09b9d95dee3bb91b5
treeb245db305c7bd729d2d802b2eccbf44f294de1b4tree | snapshot
parentf50a2555301e7e1d5e4bde32c380a3576e998407commit | diff
parent3b7b05ce8db881acfdcf193b3c8fb3d4919eb1c2commit | diff
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging:
  Symbian socket: Implement systemProxyForQuery for service networks
  tst_q3dns: update test to follow RFC-5952.
  Doc: update platform notes on Mac to reflect WA_MacNoCocoaChildWindow (cherry picked from commit b240f8a2ee3b7ff82a389fbf5dfd076792f385e8)
  QT_USE_QSTRINGBUILDER to fix source compatibility
  Make QHostAddress.toString() follow RFC-5952 for IPv6 address format.
6b46b7419a5aee9bd5fce67b7bfa8afe8e