From b1e650a889fd18bdc47aed07c518f5f8ba663d97 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Wed, 28 Sep 2011 16:52:12 +1000 Subject: 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 Reviewed-by: Rohan McGovern --- .../declarative/qdeclarativefontloader/qdeclarativefontloader.pro | 8 +------- .../qdeclarativefontloader/tst_qdeclarativefontloader.cpp | 5 ----- 2 files changed, 1 insertion(+), 12 deletions(-) (limited to 'tests/auto/declarative/qdeclarativefontloader') 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 -- cgit v1.2.3