Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
authorQt Continuous Integration System <qt-info@nokia.com>
Tue, 6 Dec 2011 00:07:45 +0000 (10:07 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Tue, 6 Dec 2011 00:07:45 +0000 (10:07 +1000)
commit3b6324bf11f31d09424297c5e789e5ce4f0afbb7
tree2122f813a270ecc1928ed46123137202bcd57e3a
parent235e4fb7316cfe65605c3a035cf3a4f0d167335c
parentbe08fa8280d95c2edda7e2aaee6a5211062b0090
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team:
  Symbian: allow apps to disable GL multisampling
  QSqlRelationalTableModel doesn't follow relations on the first column
  symbian - don't export qsymbianbearer.qtplugin twice