Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Thu, 6 Oct 2011 01:11:41 +0000 (11:11 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 6 Oct 2011 01:11:41 +0000 (11:11 +1000)
commitf2526089d4b84b0b2c8a511ff2c22a22a6f2ee73
tree6626b9b43424c00041a4b210538a58f324430066
parentf7cfc5e3ef17d0be0d4290f05428033055fb8731
parentf4f1b712e1389987e045bb8f6ba654ea9e11d24e
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Build fix for WINCE to qfilesystemengine_win.cpp
  Fixed typo in QSettings documentation.
  remove dead code