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 20:55:03 +0000 (22:55 +0200)
committerQt Continuous Integration System <qt-info@nokia.com>
Tue, 13 Apr 2010 20:55:03 +0000 (22:55 +0200)
commit0dbd8f1b0a6df20e5502bb35e58490a9f99953a7
treecf27566f41ea9ebedd166941cfeffe2c4930b094
parentac187c6e40d5142a2811be30f0e5035581e14859
parentc0e9740fe15b3034091118b593359b4b9b4cbe87
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