Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team
authorQt Continuous Integration System <qt-info@nokia.com>
Wed, 7 Dec 2011 09:49:09 +0000 (19:49 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Wed, 7 Dec 2011 09:49:09 +0000 (19:49 +1000)
commit376343a9d14377ce8b9f92f9c3a35af267fce0ef
tree01f0662984699bff715e2e7bf1a447b694409ec3
parent8fb324791d89fa2e27566cc83aadecc13918b9bd
parent1290b1328c5168db0b922dfd19ba88db3cc265cf
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team:
  tests: make tests compile or disable those which don't compile
  Fix declarative examples and demos issue on Windows
  Symbian: allow apps to disable GL multisampling
  QSqlRelationalTableModel doesn't follow relations on the first column
  symbian - don't export qsymbianbearer.qtplugin twice