Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master...
authorQt Continuous Integration System <qt-info@nokia.com>
Tue, 6 Dec 2011 19:30:48 +0000 (05:30 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Tue, 6 Dec 2011 19:30:48 +0000 (05:30 +1000)
commit8a390046adddb8df3ddcf3a421f6f547e6cfe7aa
tree8b8879cea103c26956067adf2e66dfaf7edeea0c
parente1a6e877e5d3acfb29b291e946e836fbe3e25cb9
parent3b6324bf11f31d09424297c5e789e5ce4f0afbb7
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:
  Symbian: allow apps to disable GL multisampling
  QSqlRelationalTableModel doesn't follow relations on the first column
  symbian - don't export qsymbianbearer.qtplugin twice
src/s60installs/s60installs.pro