summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-05-18 14:59:17 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-05-18 14:59:17 (GMT)
commitecd5b132929c5e4d43aa7409ef4ff2c22037b4f8 (patch)
tree0875142041e7c3191d3c5afb109d3eeb2c91137c
parent2498a8452de58d24c330560d2ad3cd5f3e717c3c (diff)
parentb8ff438747c620c6ed3d93c841d4f148f2087520 (diff)
downloadQt-ecd5b132929c5e4d43aa7409ef4ff2c22037b4f8.zip
Qt-ecd5b132929c5e4d43aa7409ef4ff2c22037b4f8.tar.gz
Qt-ecd5b132929c5e4d43aa7409ef4ff2c22037b4f8.tar.bz2
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: Increased EPOCHEAPSIZE for qpainter benchmark Increased EPOCHEAPSIZE for few benchmarks
-rw-r--r--tests/benchmarks/corelib/tools/containers-sequential/containers-sequential.pro2
-rw-r--r--tests/benchmarks/gui/graphicsview/qgraphicsscene/qgraphicsscene.pro1
-rw-r--r--tests/benchmarks/gui/painting/qpainter/qpainter.pro2
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