diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-20 03:48:01 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-20 03:48:01 (GMT) |
| commit | 09b3ebb0693a7c1449bfb86885c13deca71d98b1 (patch) | |
| tree | 3e31e66956330554b669b2e8bbbd70a0a589996c /tests/benchmarks | |
| parent | 0579ebd898f4e208ce0bd4c332d71eb878c5059f (diff) | |
| parent | ecd5b132929c5e4d43aa7409ef4ff2c22037b4f8 (diff) | |
| download | Qt-09b3ebb0693a7c1449bfb86885c13deca71d98b1.zip Qt-09b3ebb0693a7c1449bfb86885c13deca71d98b1.tar.gz Qt-09b3ebb0693a7c1449bfb86885c13deca71d98b1.tar.bz2 | |
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.
Diffstat (limited to 'tests/benchmarks')
3 files changed, 5 insertions, 0 deletions
diff --git a/tests/benchmarks/corelib/tools/containers-sequential/containers-sequential.pro b/tests/benchmarks/corelib/tools/containers-sequential/containers-sequential.pro index 656510e..2f68a9b 100644 --- a/tests/benchmarks/corelib/tools/containers-sequential/containers-sequential.pro +++ b/tests/benchmarks/corelib/tools/containers-sequential/containers-sequential.pro @@ -7,3 +7,5 @@ INCLUDEPATH += . # Input SOURCES += main.cpp QT -= gui + +symbian: TARGET.EPOCHEAPSIZE = 0x100000 0x3000000 diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsscene/qgraphicsscene.pro b/tests/benchmarks/gui/graphicsview/qgraphicsscene/qgraphicsscene.pro index 1b7a5dc..4245233 100644 --- a/tests/benchmarks/gui/graphicsview/qgraphicsscene/qgraphicsscene.pro +++ b/tests/benchmarks/gui/graphicsview/qgraphicsscene/qgraphicsscene.pro @@ -4,3 +4,4 @@ TARGET = tst_bench_qgraphicsscene SOURCES += tst_qgraphicsscene.cpp +symbian: TARGET.EPOCHEAPSIZE = 0x100000 0x3000000 diff --git a/tests/benchmarks/gui/painting/qpainter/qpainter.pro b/tests/benchmarks/gui/painting/qpainter/qpainter.pro index 6603aba..1ab4522 100644 --- a/tests/benchmarks/gui/painting/qpainter/qpainter.pro +++ b/tests/benchmarks/gui/painting/qpainter/qpainter.pro @@ -3,3 +3,5 @@ TEMPLATE = app TARGET = tst_bench_qpainter SOURCES += tst_qpainter.cpp + +symbian: TARGET.EPOCHEAPSIZE = 0x100000 0x3000000 |