diff options
author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-05-14 13:37:35 (GMT) |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-05-14 14:08:58 (GMT) |
commit | 18af9ef6074c33f7416629007ef5d24a39a55cbe (patch) | |
tree | 5342c665bf6b0aa3f8673924d5742ebad34fbc9e /tests/benchmarks/declarative/qdeclarativemetaproperty | |
parent | f4ffb4b082a43ba267855fbe915da9f934f59043 (diff) | |
download | Qt-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/qdeclarativemetaproperty')
-rw-r--r-- | tests/benchmarks/declarative/qdeclarativemetaproperty/qdeclarativemetaproperty.pro | 11 | ||||
-rw-r--r-- | tests/benchmarks/declarative/qdeclarativemetaproperty/tst_qdeclarativemetaproperty.cpp | 4 |
2 files changed, 13 insertions, 2 deletions
diff --git a/tests/benchmarks/declarative/qdeclarativemetaproperty/qdeclarativemetaproperty.pro b/tests/benchmarks/declarative/qdeclarativemetaproperty/qdeclarativemetaproperty.pro index 79fdd26..1b72fc5 100644 --- a/tests/benchmarks/declarative/qdeclarativemetaproperty/qdeclarativemetaproperty.pro +++ b/tests/benchmarks/declarative/qdeclarativemetaproperty/qdeclarativemetaproperty.pro @@ -6,5 +6,12 @@ macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativemetaproperty.cpp -# Define SRCDIR equal to test's source directory -DEFINES += SRCDIR=\\\"$$PWD\\\" +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/qdeclarativemetaproperty/tst_qdeclarativemetaproperty.cpp b/tests/benchmarks/declarative/qdeclarativemetaproperty/tst_qdeclarativemetaproperty.cpp index 8a5f4ae..6e71e7d 100644 --- a/tests/benchmarks/declarative/qdeclarativemetaproperty/tst_qdeclarativemetaproperty.cpp +++ b/tests/benchmarks/declarative/qdeclarativemetaproperty/tst_qdeclarativemetaproperty.cpp @@ -48,6 +48,10 @@ //TESTED_FILES= +#ifdef Q_OS_SYMBIAN +// In Symbian OS test data is located in applications private dir +#define SRCDIR "." +#endif class tst_qmlmetaproperty : public QObject { |