projects / qt:qt.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8062464 c3d2d58)
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>
Mon, 17 Jan 2011 03:20:55 +0000 (13:20 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Mon, 17 Jan 2011 03:20:55 +0000 (13:20 +1000)
commit4631d297781b8ad4eba0735b7023265d4872c1cb
treeecd86d0096081fc1a71c6a0cfa4878f97b447100tree | snapshot
parent8062464ce3f5fd6eb92f94d1fafa697385de72cecommit | diff
parentc3d2d583121219836714609b250e4e52e33e393dcommit | diff
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:
  fixed CI gate flagged spelling error: occured -> occurred
  file rename
  various fixes to deal with CI gate failures
  Fix system proxy test: QNetworkProxyFactory::systemProxyForQuery() is static
  QNetworkProxyFactory::systemProxyForQuery() for Symbian
6b46b7419a5aee9bd5fce67b7bfa8afe8e