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/qdeclarativefontloader | |
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/qdeclarativefontloader')
-rw-r--r-- | tests/auto/declarative/qdeclarativefontloader/qdeclarativefontloader.pro | 4 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativefontloader/tst_qdeclarativefontloader.cpp | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/tests/auto/declarative/qdeclarativefontloader/qdeclarativefontloader.pro b/tests/auto/declarative/qdeclarativefontloader/qdeclarativefontloader.pro index dbe0dcb..01dca26 100644 --- a/tests/auto/declarative/qdeclarativefontloader/qdeclarativefontloader.pro +++ b/tests/auto/declarative/qdeclarativefontloader/qdeclarativefontloader.pro @@ -5,11 +5,9 @@ macx:CONFIG -= app_bundle HEADERS += ../shared/testhttpserver.h SOURCES += tst_qdeclarativefontloader.cpp ../shared/testhttpserver.cpp -# 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/qdeclarativefontloader/tst_qdeclarativefontloader.cpp b/tests/auto/declarative/qdeclarativefontloader/tst_qdeclarativefontloader.cpp index 36908d9..ae23017 100644 --- a/tests/auto/declarative/qdeclarativefontloader/tst_qdeclarativefontloader.cpp +++ b/tests/auto/declarative/qdeclarativefontloader/tst_qdeclarativefontloader.cpp @@ -47,6 +47,11 @@ #define SERVER_PORT 14448 +#ifdef Q_OS_SYMBIAN +// In Symbian OS test data is located in applications private dir +#define SRCDIR "." +#endif + class tst_qdeclarativefontloader : public QObject { |