diff options
| author | Joona Petrell <joona.t.petrell@nokia.com> | 2010-06-07 07:04:45 (GMT) |
|---|---|---|
| committer | Joona Petrell <joona.t.petrell@nokia.com> | 2010-06-08 00:27:02 (GMT) |
| commit | e4c7f469d1cdaf535b5e7aacaca7f96553084b79 (patch) | |
| tree | a86d3fea6b2200811cb5d3b4934fd17af4f93086 /tests/auto/declarative/qdeclarativeimageprovider | |
| parent | 93c51dc195d2f2c99d4464b105ebc826cd7f9b2f (diff) | |
| download | Qt-e4c7f469d1cdaf535b5e7aacaca7f96553084b79.zip Qt-e4c7f469d1cdaf535b5e7aacaca7f96553084b79.tar.gz Qt-e4c7f469d1cdaf535b5e7aacaca7f96553084b79.tar.bz2 | |
Make declarative autotests compile on Symbian abld build system
Task-number:
Reviewed-by: Martin Jones
Diffstat (limited to 'tests/auto/declarative/qdeclarativeimageprovider')
| -rw-r--r-- | tests/auto/declarative/qdeclarativeimageprovider/qdeclarativeimageprovider.pro | 4 | ||||
| -rw-r--r-- | tests/auto/declarative/qdeclarativeimageprovider/tst_qdeclarativeimageprovider.cpp | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/tests/auto/declarative/qdeclarativeimageprovider/qdeclarativeimageprovider.pro b/tests/auto/declarative/qdeclarativeimageprovider/qdeclarativeimageprovider.pro index 1b828a5..bdb6423 100644 --- a/tests/auto/declarative/qdeclarativeimageprovider/qdeclarativeimageprovider.pro +++ b/tests/auto/declarative/qdeclarativeimageprovider/qdeclarativeimageprovider.pro @@ -8,11 +8,9 @@ SOURCES += tst_qdeclarativeimageprovider.cpp # QMAKE_CXXFLAGS = -fprofile-arcs -ftest-coverage # LIBS += -lgcov -# Define SRCDIR equal to test's source directory symbian: { - DEFINES += SRCDIR=\".\" importFiles.sources = data - importFiles.path = + importFiles.path = . DEPLOYMENT = importFiles } else { DEFINES += SRCDIR=\\\"$$PWD\\\" diff --git a/tests/auto/declarative/qdeclarativeimageprovider/tst_qdeclarativeimageprovider.cpp b/tests/auto/declarative/qdeclarativeimageprovider/tst_qdeclarativeimageprovider.cpp index cc4ec20..4185790 100644 --- a/tests/auto/declarative/qdeclarativeimageprovider/tst_qdeclarativeimageprovider.cpp +++ b/tests/auto/declarative/qdeclarativeimageprovider/tst_qdeclarativeimageprovider.cpp @@ -45,6 +45,11 @@ #include <private/qdeclarativeimage_p.h> #include <QImageReader> +#ifdef Q_OS_SYMBIAN +// In Symbian OS test data is located in applications private dir +#define SRCDIR "." +#endif + // QDeclarativeImageProvider::request() is run in an idle thread where possible // Be generous in our timeout. #define TRY_WAIT(expr) \ |