From 95cebd34ebc5b4d39b11dc91610309a35e488663 Mon Sep 17 00:00:00 2001
From: Jason McDonald <jason.mcdonald@nokia.com>
Date: Tue, 27 Sep 2011 19:53:01 +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: I1172e6a42d518490e63e9599bf10579df08259aa
Reviewed-on: http://codereview.qt-project.org/5657
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
---
 tests/benchmarks/gui/text/qtext/main.cpp  | 10 ----------
 tests/benchmarks/gui/text/qtext/qtext.pro |  9 +--------
 2 files changed, 1 insertion(+), 18 deletions(-)

(limited to 'tests/benchmarks/gui/text')

diff --git a/tests/benchmarks/gui/text/qtext/main.cpp b/tests/benchmarks/gui/text/qtext/main.cpp
index fcde5dfcaf..a7da42e347 100644
--- a/tests/benchmarks/gui/text/qtext/main.cpp
+++ b/tests/benchmarks/gui/text/qtext/main.cpp
@@ -51,12 +51,6 @@
 #include <QBuffer>
 #include <qtest.h>
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-// Application private dir is default serach path for files, so SRCDIR can be set to empty
-#define SRCDIR ""
-#endif
-
 Q_DECLARE_METATYPE(QTextDocument*)
 
 class tst_QText: public QObject
@@ -141,11 +135,7 @@ void tst_QText::shaping_data()
     QTest::newRow("lorem") << m_lorem;
     QTest::newRow("short") << QString::fromLatin1("Lorem ipsum dolor sit amet");
 
-#if !defined(Q_OS_SYMBIAN)
     QFile file(QString::fromLatin1(SRCDIR) + QLatin1String("/bidi.txt"));
-#else
-    QFile file( SRCDIR "bidi.txt" );
-#endif
     QVERIFY(file.open(QFile::ReadOnly));
     QByteArray data = file.readAll();
     QVERIFY(data.count() > 1000);
diff --git a/tests/benchmarks/gui/text/qtext/qtext.pro b/tests/benchmarks/gui/text/qtext/qtext.pro
index b1daf69210..91368859b6 100644
--- a/tests/benchmarks/gui/text/qtext/qtext.pro
+++ b/tests/benchmarks/gui/text/qtext/qtext.pro
@@ -10,11 +10,4 @@ TARGET = tst_bench_QText
 
 SOURCES += main.cpp
 
-symbian* {
-   TARGET.CAPABILITY = ALL -TCB
-   addFiles.files = bidi.txt
-   addFiles.path = .
-   DEPLOYMENT += addFiles
-} else {
-   DEFINES += SRCDIR=\\\"$$PWD/\\\"
-}
+DEFINES += SRCDIR=\\\"$$PWD/\\\"
-- 
cgit v1.2.3