diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2010-02-23 12:37:03 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2010-02-23 12:37:03 (GMT) |
| commit | 3fbca149d041db37ad5236729525b797cde51aed (patch) | |
| tree | d232e3a98e2b313e3a4b4fb02954cfdd868e310d | |
| parent | 8ad76444ad4589e0b69056cca283253070dae350 (diff) | |
| parent | fcd4c0dce69e22487d9141f3bf5de6d4c56a3432 (diff) | |
| download | Qt-3fbca149d041db37ad5236729525b797cde51aed.zip Qt-3fbca149d041db37ad5236729525b797cde51aed.tar.gz Qt-3fbca149d041db37ad5236729525b797cde51aed.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
| -rw-r--r-- | tests/benchmarks/declarative/binding/binding.pro | 6 | ||||
| -rw-r--r-- | tests/benchmarks/declarative/creation/creation.pro | 9 | ||||
| -rw-r--r-- | tests/benchmarks/declarative/creation/tst_creation.cpp | 6 |
3 files changed, 19 insertions, 2 deletions
diff --git a/tests/benchmarks/declarative/binding/binding.pro b/tests/benchmarks/declarative/binding/binding.pro index e25f186..aa4cc41 100644 --- a/tests/benchmarks/declarative/binding/binding.pro +++ b/tests/benchmarks/declarative/binding/binding.pro @@ -7,3 +7,9 @@ macx:CONFIG -= app_bundle SOURCES += tst_binding.cpp testtypes.cpp HEADERS += testtypes.h +symbian* { + data.sources = data/* + data.path = data + DEPLOYMENT = data +} + diff --git a/tests/benchmarks/declarative/creation/creation.pro b/tests/benchmarks/declarative/creation/creation.pro index fcc2987..3e0caf6 100644 --- a/tests/benchmarks/declarative/creation/creation.pro +++ b/tests/benchmarks/declarative/creation/creation.pro @@ -6,5 +6,10 @@ macx:CONFIG -= app_bundle SOURCES += tst_creation.cpp -DEFINES += SRCDIR=\\\"$$PWD\\\" - +symbian* { + data.sources = data/* + data.path = data + DEPLOYMENT += addFiles +} else { + DEFINES += SRCDIR=\\\"$$PWD\\\" +}
\ No newline at end of file diff --git a/tests/benchmarks/declarative/creation/tst_creation.cpp b/tests/benchmarks/declarative/creation/tst_creation.cpp index 23c820c..b99031a 100644 --- a/tests/benchmarks/declarative/creation/tst_creation.cpp +++ b/tests/benchmarks/declarative/creation/tst_creation.cpp @@ -49,6 +49,12 @@ #include <QmlGraphicsItem> #include <private/qobject_p.h> +#ifdef Q_OS_SYMBIAN +// In Symbian OS test data is located in applications private dir +// Application private dir is default serach path for files, so SRCDIR can be set to empty +#define SRCDIR "" +#endif + class tst_creation : public QObject { Q_OBJECT |