Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Mon, 12 Apr 2010 18:30:24 +0000 (20:30 +0200)
committerQt Continuous Integration System <qt-info@nokia.com>
Mon, 12 Apr 2010 18:30:24 +0000 (20:30 +0200)
commit2044890bb807dc5879d7cbb1863c56c64249c3ef
tree33b400e53b71ccd6ac5ea0da41cb9285aafaa988
parent0ef6bb1dfadf8e83f20e2282ff4a73a466b3de87
parent1db8232bd50874b3db16031b9c8ef13984bf32dd
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Fixed app freeze if switching to offline in middle of HTTP transaction.
  Document Symbian platform security requirements on Qt APIs
  Fixed app freeze if switching to offline in middle of HTTP transaction.
  Removed QtDeclarative.dll deployment from qt.iby in 4.6 branch.
  Don't build QtXmlPatterns' command line tools on Symbian.