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/auto/declarative/qdeclarativeborderimage/qdeclarativeborderimage.pro | |
| 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/auto/declarative/qdeclarativeborderimage/qdeclarativeborderimage.pro')
| -rw-r--r-- | tests/auto/declarative/qdeclarativeborderimage/qdeclarativeborderimage.pro | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/tests/auto/declarative/qdeclarativeborderimage/qdeclarativeborderimage.pro b/tests/auto/declarative/qdeclarativeborderimage/qdeclarativeborderimage.pro index e754923..3aa2197 100644 --- a/tests/auto/declarative/qdeclarativeborderimage/qdeclarativeborderimage.pro +++ b/tests/auto/declarative/qdeclarativeborderimage/qdeclarativeborderimage.pro @@ -6,7 +6,14 @@ HEADERS += ../shared/testhttpserver.h SOURCES += tst_qdeclarativeborderimage.cpp ../shared/testhttpserver.cpp # Define SRCDIR equal to test's source directory -DEFINES += SRCDIR=\\\"$$PWD\\\" +symbian: { + DEFINES += SRCDIR=\".\" + importFiles.sources = data + importFiles.path = + DEPLOYMENT = importFiles +} else { + DEFINES += SRCDIR=\\\"$$PWD\\\" +} CONFIG += parallel_test |