Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master...
authorQt Continuous Integration System <qt-info@nokia.com>
Wed, 14 Dec 2011 15:39:34 +0000 (01:39 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Wed, 14 Dec 2011 15:39:34 +0000 (01:39 +1000)
commite2b42a54ddd25e4ceb76b4aeb7de1ffb971feb83
treebf9233a1881b5c6d1a37b7c042f55e96376a4786
parentf1066ac7a895b028e2459d60bc7e8013a9369cfe
parent9dd2051ba6d9575f7a5a6a0746e1d0d1a1e5efe6
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging:
  Default to QDir::homePath() in Symbian native file dialogs
  Fix NTLM authentication with email address
  Fix null pointer dereference in NTLM authentication