diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-05-17 08:20:30 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-05-17 08:20:30 (GMT) |
| commit | 4d4cb1023d693a2a4130e032c8894e0f56250f93 (patch) | |
| tree | 24e3db8d63b7149b81c3b509fb5b820caf7ecbff /tests/benchmarks/declarative/creation | |
| parent | 8fe40ca28e88d156b9a0ef9cc4c818a666499231 (diff) | |
| parent | bdbe09ad2c01ae11d10511b51f8d7a3dfb27b17c (diff) | |
| download | Qt-4d4cb1023d693a2a4130e032c8894e0f56250f93.zip Qt-4d4cb1023d693a2a4130e032c8894e0f56250f93.tar.gz Qt-4d4cb1023d693a2a4130e032c8894e0f56250f93.tar.bz2 | |
Merge commit 'qt/4.7' into 4.7
Conflicts:
tests/benchmarks/declarative/binding/binding.pro
tests/benchmarks/declarative/creation/creation.pro
tests/benchmarks/declarative/creation/tst_creation.cpp
tests/benchmarks/declarative/qdeclarativecomponent/qdeclarativecomponent.pro
tests/benchmarks/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp
tests/benchmarks/declarative/qdeclarativemetaproperty/qdeclarativemetaproperty.pro
Diffstat (limited to 'tests/benchmarks/declarative/creation')
| -rw-r--r-- | tests/benchmarks/declarative/creation/creation.pro | 4 | ||||
| -rw-r--r-- | tests/benchmarks/declarative/creation/tst_creation.cpp | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/tests/benchmarks/declarative/creation/creation.pro b/tests/benchmarks/declarative/creation/creation.pro index a5df676..6540fa2 100644 --- a/tests/benchmarks/declarative/creation/creation.pro +++ b/tests/benchmarks/declarative/creation/creation.pro @@ -6,10 +6,10 @@ macx:CONFIG -= app_bundle SOURCES += tst_creation.cpp -symbian* { +symbian { data.sources = data data.path = . DEPLOYMENT += data } 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 a253671..1c3332e 100644 --- a/tests/benchmarks/declarative/creation/tst_creation.cpp +++ b/tests/benchmarks/declarative/creation/tst_creation.cpp @@ -52,7 +52,6 @@ #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 |