summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJedrzej Nowacki <jedrzej.nowacki@nokia.com>2011-05-11 15:15:04 +0200
committerJedrzej Nowacki <jedrzej.nowacki@nokia.com>2011-05-25 10:37:48 +0200
commitf14139bb9fe8233abe49f9affda977df30381e25 (patch)
tree0195b4c329982ddc4a534feec98e408c1d475c49
parent54eb31e455ac9c26622c099e9a2fc3f4919bce45 (diff)
Fix QtScript benchmarks.
Add benchmarks to tests.pro file and fix some dependencies. Reviewed-by: Olivier Goffart
-rw-r--r--tests/benchmarks/benchmarks.pro3
-rw-r--r--tests/benchmarks/script/context2d/context2d.pro2
-rw-r--r--tests/benchmarks/script/qscriptclass_bytearray/qscriptclass_bytearray.pro2
-rw-r--r--tests/benchmarks/script/qscriptengine/qscriptengine.pro2
-rw-r--r--tests/tests.pro2
5 files changed, 7 insertions, 4 deletions
diff --git a/tests/benchmarks/benchmarks.pro b/tests/benchmarks/benchmarks.pro
new file mode 100644
index 0000000..93b1a65
--- /dev/null
+++ b/tests/benchmarks/benchmarks.pro
@@ -0,0 +1,3 @@
+TEMPLATE = subdirs
+SUBDIRS = \
+ script \ No newline at end of file
diff --git a/tests/benchmarks/script/context2d/context2d.pro b/tests/benchmarks/script/context2d/context2d.pro
index bc94c4f..12a9c2f 100644
--- a/tests/benchmarks/script/context2d/context2d.pro
+++ b/tests/benchmarks/script/context2d/context2d.pro
@@ -4,7 +4,7 @@ TARGET = tst_bench_context2d
SOURCES += tst_context2d.cpp
-CONTEXT2D_EXAMPLE_DIR = $$QT_SOURCE_TREE/examples/script/context2d
+CONTEXT2D_EXAMPLE_DIR = $$PWD/../../../../examples/script/context2d
INCLUDEPATH += $$CONTEXT2D_EXAMPLE_DIR
HEADERS += $$CONTEXT2D_EXAMPLE_DIR/qcontext2dcanvas.h \
diff --git a/tests/benchmarks/script/qscriptclass_bytearray/qscriptclass_bytearray.pro b/tests/benchmarks/script/qscriptclass_bytearray/qscriptclass_bytearray.pro
index d64f705..d328c44 100644
--- a/tests/benchmarks/script/qscriptclass_bytearray/qscriptclass_bytearray.pro
+++ b/tests/benchmarks/script/qscriptclass_bytearray/qscriptclass_bytearray.pro
@@ -5,6 +5,6 @@ TARGET = tst_bench_qscriptclass_bytearray
SOURCES += tst_qscriptclass_bytearray.cpp
RESOURCES += qscriptclass_bytearray.qrc
-include($$QT_SOURCE_TREE/examples/script/customclass/bytearrayclass.pri)
+include($$PWD/../../../../examples/script/customclass/bytearrayclass.pri)
QT = core script
diff --git a/tests/benchmarks/script/qscriptengine/qscriptengine.pro b/tests/benchmarks/script/qscriptengine/qscriptengine.pro
index 72a547a..1f178d8 100644
--- a/tests/benchmarks/script/qscriptengine/qscriptengine.pro
+++ b/tests/benchmarks/script/qscriptengine/qscriptengine.pro
@@ -4,7 +4,7 @@ TARGET = tst_bench_qscriptengine
SOURCES += tst_qscriptengine.cpp
-QT += script
+QT += script script-private
symbian* {
TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 // Min 128kB, Max 32MB
diff --git a/tests/tests.pro b/tests/tests.pro
index 85e4f3a..f5731b2 100644
--- a/tests/tests.pro
+++ b/tests/tests.pro
@@ -1,2 +1,2 @@
TEMPLATE = subdirs
-SUBDIRS += auto
+SUBDIRS += auto benchmarks