summaryrefslogtreecommitdiffstats
path: root/tests/benchmarks/declarative/binding
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2010-05-14 13:37:35 (GMT)
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2010-05-14 14:08:58 (GMT)
commit18af9ef6074c33f7416629007ef5d24a39a55cbe (patch)
tree5342c665bf6b0aa3f8673924d5742ebad34fbc9e /tests/benchmarks/declarative/binding
parentf4ffb4b082a43ba267855fbe915da9f934f59043 (diff)
downloadQt-18af9ef6074c33f7416629007ef5d24a39a55cbe.zip
Qt-18af9ef6074c33f7416629007ef5d24a39a55cbe.tar.gz
Qt-18af9ef6074c33f7416629007ef5d24a39a55cbe.tar.bz2
Fix SRCDIR and DEPLOYMENT usage in declarative benchmarks
These tests were either not compiling, were deploying incorrectly, or looking for data files from wrong place. Task-number: QTBUG-10661 Task-number: QTBUG-10666 Task-number: QTBUG-10667 Reviewed-by: Shane Kearns
Diffstat (limited to 'tests/benchmarks/declarative/binding')
-rw-r--r--tests/benchmarks/declarative/binding/binding.pro12
-rw-r--r--tests/benchmarks/declarative/binding/tst_binding.cpp5
2 files changed, 11 insertions, 6 deletions
diff --git a/tests/benchmarks/declarative/binding/binding.pro b/tests/benchmarks/declarative/binding/binding.pro
index 5ceaf34..7fc0a23 100644
--- a/tests/benchmarks/declarative/binding/binding.pro
+++ b/tests/benchmarks/declarative/binding/binding.pro
@@ -7,12 +7,12 @@ macx:CONFIG -= app_bundle
SOURCES += tst_binding.cpp testtypes.cpp
HEADERS += testtypes.h
-# Define SRCDIR equal to test's source directory
-DEFINES += SRCDIR=\\\"$$PWD\\\"
-
-symbian* {
- data.sources = data/*
- data.path = data
+symbian {
+ data.sources = data
+ data.path = .
DEPLOYMENT = data
+} else {
+ # Define SRCDIR equal to test's source directory
+ DEFINES += SRCDIR=\\\"$$PWD\\\"
}
diff --git a/tests/benchmarks/declarative/binding/tst_binding.cpp b/tests/benchmarks/declarative/binding/tst_binding.cpp
index dbddac3..6e3e146 100644
--- a/tests/benchmarks/declarative/binding/tst_binding.cpp
+++ b/tests/benchmarks/declarative/binding/tst_binding.cpp
@@ -48,6 +48,11 @@
//TESTED_FILES=
+#ifdef Q_OS_SYMBIAN
+// In Symbian OS test data is located in applications private dir
+#define SRCDIR "."
+#endif
+
class tst_binding : public QObject
{
Q_OBJECT