Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Fri, 15 Oct 2010 19:23:21 +0000 (21:23 +0200)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 15 Oct 2010 19:23:21 +0000 (21:23 +0200)
commit4d9d3ed84c3bf1f6d08a9ddd36f834b9c8972b38
tree737a08d2c1ad8f56c210e3ae42fe10b2954bde04
parent1c38e7c2107b7cb7ff997126ded3819d760a3191
parentb498c15ebbf120819f73fe761388fd63c2de4b23
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  QNAM HTTP: Fix error signal emission for unreachable IPs
  Cocoa: small update to 534ba3c7314820604ba5aeeffa6051c91e7c1d09
  Change git commit template
  Cocoa: fix child window issues (QTBUG 13867, 14420, 13126)
  tst_qnetworkreply: New auto test for unreachable IPs