diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-18 21:32:56 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-18 21:32:56 (GMT) |
| commit | c9be4ccfbd63323a2d70d341c9bc490a95195148 (patch) | |
| tree | 52b1265c42351c1c96050e6168958c9c1d3c7e8c | |
| parent | fe46e32bd7dc758ae755a221a937ed40e1a16462 (diff) | |
| parent | e1ba2a3258277fc7811cad4bb27c52590b3966ec (diff) | |
| download | Qt-c9be4ccfbd63323a2d70d341c9bc490a95195148.zip Qt-c9be4ccfbd63323a2d70d341c9bc490a95195148.tar.gz Qt-c9be4ccfbd63323a2d70d341c9bc490a95195148.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging:
Fix qmake project in QtScript benchmarks
| -rw-r--r-- | tests/benchmarks/script/qscriptvalueiterator/qscriptvalueiterator.pro | 2 | ||||
| -rw-r--r-- | tests/benchmarks/script/script.pro | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/tests/benchmarks/script/qscriptvalueiterator/qscriptvalueiterator.pro b/tests/benchmarks/script/qscriptvalueiterator/qscriptvalueiterator.pro index ecd48f0..0bff039 100644 --- a/tests/benchmarks/script/qscriptvalueiterator/qscriptvalueiterator.pro +++ b/tests/benchmarks/script/qscriptvalueiterator/qscriptvalueiterator.pro @@ -1,6 +1,6 @@ load(qttest_p4) TEMPLATE = app -TARGET = tst_qscriptvalueiterator +TARGET = tst_bench_qscriptvalueiterator SOURCES += tst_qscriptvalueiterator.cpp diff --git a/tests/benchmarks/script/script.pro b/tests/benchmarks/script/script.pro index dd17012..b0770ca 100644 --- a/tests/benchmarks/script/script.pro +++ b/tests/benchmarks/script/script.pro @@ -4,6 +4,8 @@ SUBDIRS = \ qscriptengine \ qscriptvalue \ sunspider \ + qscriptqobject \ + qscriptvalueiterator \ v8 TRUSTED_BENCHMARKS += \ |