Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Tue, 13 Apr 2010 17:07:21 +0000 (19:07 +0200)
committerQt Continuous Integration System <qt-info@nokia.com>
Tue, 13 Apr 2010 17:07:21 +0000 (19:07 +0200)
commitc0e9740fe15b3034091118b593359b4b9b4cbe87
tree4a4d24c9cfd1dddeb484f73120e38aa8c3cdccda
parent455ced3c38ed19e91f066e0431efb6036d6b6fd3
parentacbab8c493760467ce35ae2ef8d4a56f2bf327ae
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Fix QNX screen initialization
  tst_qftp: Attempting to reproduce a crash
  QNAM HTTP: Do not pipeline with WebLogic servers
  Autotest: update path location on the test server
  Autotest: update location of fluke.gif on test server
  Make qsTr work in global scope