summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorThierry Bastian <thierry.bastian@nokia.com>2010-12-04 00:00:13 (GMT)
committerThierry Bastian <thierry.bastian@nokia.com>2010-12-04 00:00:13 (GMT)
commitaa5a3a4c13223dabe2bfc5d7f288bb824524f5a3 (patch)
treed834d6d011f44507fb423b606cffa49db85032ce /tests
parent78f32680e278f9b38d02eae4a8ab21ac8958dd94 (diff)
parentdb53e4421d0a89aab15e51996071b1f63d563304 (diff)
downloadQt-aa5a3a4c13223dabe2bfc5d7f288bb824524f5a3.zip
Qt-aa5a3a4c13223dabe2bfc5d7f288bb824524f5a3.tar.gz
Qt-aa5a3a4c13223dabe2bfc5d7f288bb824524f5a3.tar.bz2
Merge branch 'master-upstream' into master-water
Diffstat (limited to 'tests')
-rw-r--r--tests/benchmarks/script/sunspider/sunspider.pro2
-rw-r--r--tests/benchmarks/script/v8/v8.pro2
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/benchmarks/script/sunspider/sunspider.pro b/tests/benchmarks/script/sunspider/sunspider.pro
index 431505b..aab4cdb 100644
--- a/tests/benchmarks/script/sunspider/sunspider.pro
+++ b/tests/benchmarks/script/sunspider/sunspider.pro
@@ -9,7 +9,7 @@ QT = core script
!symbian:DEFINES += SRCDIR=\\\"$$PWD\\\"
wince*|symbian: {
-testFiles.sources = tests
+testFiles.files = tests
testFiles.path = .
DEPLOYMENT += testFiles
}
diff --git a/tests/benchmarks/script/v8/v8.pro b/tests/benchmarks/script/v8/v8.pro
index e55fd7f..f36bda5 100644
--- a/tests/benchmarks/script/v8/v8.pro
+++ b/tests/benchmarks/script/v8/v8.pro
@@ -9,7 +9,7 @@ QT = core script
!symbian:DEFINES += SRCDIR=\\\"$$PWD\\\"
wince*|symbian: {
-testFiles.sources = tests
+testFiles.files = tests
testFiles.path = .
DEPLOYMENT += testFiles
}