diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2011-09-28 16:52:12 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-30 10:37:05 +0200 |
| commit | b1e650a889fd18bdc47aed07c518f5f8ba663d97 (patch) | |
| tree | c79864873bda8eec2588b63e0d1edd5ab61f9323 /tests/auto/declarative/qdeclarativefontloader | |
| parent | 2bb6c25b231193c19e3b52275471f274624cb408 (diff) | |
Remove Symbian-specific code from tests.
Symbian is not a supported platform for Qt5, so this code is no longer
required.
Change-Id: I5cb6d3b41fbb9fa5fea6176ad949e4e7be7c30b5
Reviewed-on: http://codereview.qt-project.org/5767
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto/declarative/qdeclarativefontloader')
| -rw-r--r-- | tests/auto/declarative/qdeclarativefontloader/qdeclarativefontloader.pro | 8 | ||||
| -rw-r--r-- | tests/auto/declarative/qdeclarativefontloader/tst_qdeclarativefontloader.cpp | 5 |
2 files changed, 1 insertions, 12 deletions
diff --git a/tests/auto/declarative/qdeclarativefontloader/qdeclarativefontloader.pro b/tests/auto/declarative/qdeclarativefontloader/qdeclarativefontloader.pro index 946e5a8a16..758f446eb2 100644 --- a/tests/auto/declarative/qdeclarativefontloader/qdeclarativefontloader.pro +++ b/tests/auto/declarative/qdeclarativefontloader/qdeclarativefontloader.pro @@ -5,13 +5,7 @@ macx:CONFIG -= app_bundle HEADERS += ../../declarative/shared/testhttpserver.h SOURCES += tst_qdeclarativefontloader.cpp ../../declarative/shared/testhttpserver.cpp -symbian: { - importFiles.files = data - importFiles.path = . - DEPLOYMENT += importFiles -} else { - DEFINES += SRCDIR=\\\"$$PWD\\\" -} +DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test diff --git a/tests/auto/declarative/qdeclarativefontloader/tst_qdeclarativefontloader.cpp b/tests/auto/declarative/qdeclarativefontloader/tst_qdeclarativefontloader.cpp index 29fe0329bb..6d17c970b8 100644 --- a/tests/auto/declarative/qdeclarativefontloader/tst_qdeclarativefontloader.cpp +++ b/tests/auto/declarative/qdeclarativefontloader/tst_qdeclarativefontloader.cpp @@ -49,11 +49,6 @@ #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 { Q_OBJECT |