Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
authorQt Continuous Integration System <qt-info@nokia.com>
Thu, 1 Dec 2011 07:47:03 +0000 (17:47 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 1 Dec 2011 07:47:03 +0000 (17:47 +1000)
commit0b51685dc7c3c8cbbbaa1fd33ab71ba16966f657
tree92b00d33a28c3068a34eb0ef043a28e7316cf6dc
parent572208788f98162af81254977135fe13abae5bf6
parentd2a3b9ee8c9329cac96b5e509df0e6a69dbef91c
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:
  Fix def files
  doc - document symbian behaviour of QFile::link
  Symbian - prefer sessions started by this process to choose proxy
  Freezing Def files in Qt
  Lightmaps demo Symbian fix
  CBA comes on top of option menu
  Fix memory leaks in OpenVG and OpenGL resource pools
  Fix sqlite driver memory eating due to close failure