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 --- .../qdeclarativefolderlistmodel/qdeclarativefolderlistmodel.pro | 8 +------- .../tst_qdeclarativefolderlistmodel.cpp | 5 ----- 2 files changed, 1 insertion(+), 12 deletions(-) (limited to 'tests/auto/declarative/qdeclarativefolderlistmodel') diff --git a/tests/auto/declarative/qdeclarativefolderlistmodel/qdeclarativefolderlistmodel.pro b/tests/auto/declarative/qdeclarativefolderlistmodel/qdeclarativefolderlistmodel.pro index ad02dd4ac1..4d878a3ea6 100644 --- a/tests/auto/declarative/qdeclarativefolderlistmodel/qdeclarativefolderlistmodel.pro +++ b/tests/auto/declarative/qdeclarativefolderlistmodel/qdeclarativefolderlistmodel.pro @@ -4,13 +4,7 @@ macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativefolderlistmodel.cpp -symbian: { - importFiles.files = data - importFiles.path = . - DEPLOYMENT += importFiles -} else { - DEFINES += SRCDIR=\\\"$$PWD\\\" -} +DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test QT += core-private gui-private declarative-private diff --git a/tests/auto/declarative/qdeclarativefolderlistmodel/tst_qdeclarativefolderlistmodel.cpp b/tests/auto/declarative/qdeclarativefolderlistmodel/tst_qdeclarativefolderlistmodel.cpp index ef7738dc2e..045b77d0b8 100644 --- a/tests/auto/declarative/qdeclarativefolderlistmodel/tst_qdeclarativefolderlistmodel.cpp +++ b/tests/auto/declarative/qdeclarativefolderlistmodel/tst_qdeclarativefolderlistmodel.cpp @@ -48,11 +48,6 @@ #include #include -#ifdef Q_OS_SYMBIAN -// In Symbian OS test data is located in applications private dir -#define SRCDIR "." -#endif - // From qdeclarastivefolderlistmodel.h const int FileNameRole = Qt::UserRole+1; const int FilePathRole = Qt::UserRole+2; -- cgit v1.2.3