diff options
| author | Eskil Abrahamsen Blomfeldt <[email protected]> | 2013-02-08 16:27:41 +0100 |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <[email protected]> | 2013-02-08 16:31:20 +0100 |
| commit | 84f9848fd9f20536b18834a54ef15c6a65f8a682 (patch) | |
| tree | c31353dd1434692b2b4f351126b3abcd8460b8a8 /tests/benchmarks/script/qscriptengine | |
| parent | e7a8eef49d6d205e6cb549e879a27af4fe7fcce4 (diff) | |
| parent | 689406ac2424095d6cd4e6bcb3430e53a7e7bbfa (diff) | |
Merge branch 'dev' into androidwip/android
Change-Id: Iee99e20b0c2eedd01e06a93b10381c03b42788dc
Diffstat (limited to 'tests/benchmarks/script/qscriptengine')
| -rw-r--r-- | tests/benchmarks/script/qscriptengine/qscriptengine.pro | 4 | ||||
| -rw-r--r-- | tests/benchmarks/script/qscriptengine/tst_qscriptengine.cpp | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/tests/benchmarks/script/qscriptengine/qscriptengine.pro b/tests/benchmarks/script/qscriptengine/qscriptengine.pro index c8e89da..cc95370 100644 --- a/tests/benchmarks/script/qscriptengine/qscriptengine.pro +++ b/tests/benchmarks/script/qscriptengine/qscriptengine.pro @@ -6,8 +6,4 @@ SOURCES += tst_qscriptengine.cpp QT += script testlib -symbian* { - TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 // Min 128kB, Max 32MB - TARGET.EPOCSTACKSIZE = 0x14000 -} DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/benchmarks/script/qscriptengine/tst_qscriptengine.cpp b/tests/benchmarks/script/qscriptengine/tst_qscriptengine.cpp index 7992e35..1e5eba0 100644 --- a/tests/benchmarks/script/qscriptengine/tst_qscriptengine.cpp +++ b/tests/benchmarks/script/qscriptengine/tst_qscriptengine.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the test suite of the Qt Toolkit. |