From 77ac469063064a85cfec79fdc8d45cee0fa8e426 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Wed, 23 Sep 2009 13:39:40 +0300 Subject: Removed explicit TARGET.EPOCHEAPSIZE statements from script tests Large enough max heap for script tests is now defined by default for all tests in qttest_p4.prf, so removed the statements from individual script tests. Reviewed-by: Janne Anttila --- tests/auto/qscriptengine/qscriptengine.pro | 1 - tests/auto/qscriptextqobject/qscriptextqobject.pro | 4 ---- tests/auto/qscriptjstestsuite/qscriptjstestsuite.pro | 10 ++++------ tests/auto/qscriptv8testsuite/qscriptv8testsuite.pro | 2 -- 4 files changed, 4 insertions(+), 13 deletions(-) diff --git a/tests/auto/qscriptengine/qscriptengine.pro b/tests/auto/qscriptengine/qscriptengine.pro index f72c070..d4c0f4c 100644 --- a/tests/auto/qscriptengine/qscriptengine.pro +++ b/tests/auto/qscriptengine/qscriptengine.pro @@ -12,5 +12,4 @@ wince*|symbian*: { symbian: { TARGET.UID3 = 0xE0340006 DEFINES += SYMBIAN_SRCDIR_UID=$$lower($$replace(TARGET.UID3,"0x","")) - TARGET.EPOCHEAPSIZE="0x100000 0x1000000 // Min 1Mb, max 16Mb" } diff --git a/tests/auto/qscriptextqobject/qscriptextqobject.pro b/tests/auto/qscriptextqobject/qscriptextqobject.pro index 9da7f47..140a4e6 100644 --- a/tests/auto/qscriptextqobject/qscriptextqobject.pro +++ b/tests/auto/qscriptextqobject/qscriptextqobject.pro @@ -1,7 +1,3 @@ load(qttest_p4) QT = core gui script SOURCES += tst_qscriptextqobject.cpp - -symbian: { - TARGET.EPOCHEAPSIZE="0x100000 0x1000000 // Min 1Mb, max 16Mb" -} diff --git a/tests/auto/qscriptjstestsuite/qscriptjstestsuite.pro b/tests/auto/qscriptjstestsuite/qscriptjstestsuite.pro index 06b861e..07a4672 100644 --- a/tests/auto/qscriptjstestsuite/qscriptjstestsuite.pro +++ b/tests/auto/qscriptjstestsuite/qscriptjstestsuite.pro @@ -1,12 +1,10 @@ load(qttest_p4) QT = core script SOURCES += tst_qscriptjstestsuite.cpp -symbian { - TARGET.EPOCHEAPSIZE = 0x020000 0xA00000 -} else { - DEFINES += SRCDIR=\\\"$$PWD\\\" -} -wince*|symbian*: { + +!symbian: DEFINES += SRCDIR=\\\"$$PWD\\\" + +wince*|symbian: { testFiles.sources = tests testFiles.path = . DEPLOYMENT += testFiles diff --git a/tests/auto/qscriptv8testsuite/qscriptv8testsuite.pro b/tests/auto/qscriptv8testsuite/qscriptv8testsuite.pro index 3f641b5..03e26bd 100644 --- a/tests/auto/qscriptv8testsuite/qscriptv8testsuite.pro +++ b/tests/auto/qscriptv8testsuite/qscriptv8testsuite.pro @@ -8,5 +8,3 @@ testFiles.sources = tests testFiles.path = . DEPLOYMENT += testFiles } - -symbian:TARGET.EPOCHEAPSIZE = 0x00020000 0x02000000 -- cgit v0.12