diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2011-09-27 19:53:01 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-29 06:41:42 +0200 |
| commit | 95cebd34ebc5b4d39b11dc91610309a35e488663 (patch) | |
| tree | 90ceffef5acea093dd2b8f8f7e8c30593023b85a /tests/benchmarks/corelib/tools | |
| parent | ab061e3e436fab35eac8666f3e950e98f66c4d3e (diff) | |
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>
Diffstat (limited to 'tests/benchmarks/corelib/tools')
5 files changed, 2 insertions, 20 deletions
diff --git a/tests/benchmarks/corelib/tools/containers-sequential/main.cpp b/tests/benchmarks/corelib/tools/containers-sequential/main.cpp index c05fd8b685..ebcc0202ff 100644 --- a/tests/benchmarks/corelib/tools/containers-sequential/main.cpp +++ b/tests/benchmarks/corelib/tools/containers-sequential/main.cpp @@ -132,8 +132,8 @@ struct Large { // A "large" item type int x[1000]; }; -// Symbian devices typically have limited memory -#if defined(Q_OS_SYMBIAN) || defined(Q_WS_WINCE) +// Embedded devices typically have limited memory +#if defined(Q_WS_WINCE) # define LARGE_MAX_SIZE 2000 #else # define LARGE_MAX_SIZE 20000 diff --git a/tests/benchmarks/corelib/tools/qbytearray/main.cpp b/tests/benchmarks/corelib/tools/qbytearray/main.cpp index 97ac57d53d..2c9b9d0638 100644 --- a/tests/benchmarks/corelib/tools/qbytearray/main.cpp +++ b/tests/benchmarks/corelib/tools/qbytearray/main.cpp @@ -73,11 +73,6 @@ void tst_qbytearray::append() { QFETCH(int, size); -#ifdef Q_OS_SYMBIAN - if (size > 1000000) - QSKIP("Skipped due to limited memory in many Symbian devices.", SkipSingle); -#endif - QByteArray ba; QBENCHMARK { QByteArray ba2(size, 'x'); diff --git a/tests/benchmarks/corelib/tools/qstring/main.cpp b/tests/benchmarks/corelib/tools/qstring/main.cpp index 95aaad3a25..4d84451e39 100644 --- a/tests/benchmarks/corelib/tools/qstring/main.cpp +++ b/tests/benchmarks/corelib/tools/qstring/main.cpp @@ -42,12 +42,6 @@ #include <QFile> #include <QtTest/QtTest> -#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 - #ifdef Q_OS_UNIX #include <sys/mman.h> #include <unistd.h> diff --git a/tests/benchmarks/corelib/tools/qstring/qstring.pro b/tests/benchmarks/corelib/tools/qstring/qstring.pro index 3fd76ac63b..33240aef8d 100644 --- a/tests/benchmarks/corelib/tools/qstring/qstring.pro +++ b/tests/benchmarks/corelib/tools/qstring/qstring.pro @@ -10,11 +10,6 @@ SOURCES += main.cpp data.cpp fromlatin1.cpp fromutf8.cpp wince*:{ DEFINES += SRCDIR=\\\"\\\" -} else:symbian* { - addFiles.files = utf-8.txt - addFiles.path = . - DEPLOYMENT += addFiles - TARGET.EPOCHEAPSIZE="0x100 0x1000000" } else { DEFINES += SRCDIR=\\\"$$PWD/\\\" } diff --git a/tests/benchmarks/corelib/tools/qstringlist/qstringlist.pro b/tests/benchmarks/corelib/tools/qstringlist/qstringlist.pro index f8df773442..c7df0ac160 100644 --- a/tests/benchmarks/corelib/tools/qstringlist/qstringlist.pro +++ b/tests/benchmarks/corelib/tools/qstringlist/qstringlist.pro @@ -8,5 +8,3 @@ CONFIG -= debug CONFIG += release QT -= gui SOURCES += main.cpp - -symbian: LIBS += -llibpthread |