Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master...
authorQt Continuous Integration System <qt-info@nokia.com>
Fri, 20 May 2011 03:48:01 +0000 (13:48 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 20 May 2011 03:48:01 +0000 (13:48 +1000)
commit09b3ebb0693a7c1449bfb86885c13deca71d98b1
tree3e31e66956330554b669b2e8bbbd70a0a589996c
parent0579ebd898f4e208ce0bd4c332d71eb878c5059f
parentecd5b132929c5e4d43aa7409ef4ff2c22037b4f8
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:
  Increased EPOCHEAPSIZE for qpainter benchmark
  Increased EPOCHEAPSIZE for few benchmarks
  Update Symbian DEF-files
  Improve DEFINES crossplatform compatibility in Symbian builds.
  Freezing the QtCore defs again for 4.8.
qmake/generators/symbian/symmake.cpp
qmake/generators/symbian/symmake_sbsv2.cpp