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 --- tests/benchmarks/declarative/binding/binding.pro | 10 ++-------- tests/benchmarks/declarative/binding/tst_binding.cpp | 5 ----- tests/benchmarks/declarative/compilation/compilation.pro | 8 +------- tests/benchmarks/declarative/compilation/tst_compilation.cpp | 5 ----- tests/benchmarks/declarative/creation/creation.pro | 8 +------- tests/benchmarks/declarative/creation/tst_creation.cpp | 5 ----- tests/benchmarks/declarative/holistic/holistic.pro | 8 +------- tests/benchmarks/declarative/holistic/tst_holistic.cpp | 5 ----- tests/benchmarks/declarative/js/qjsengine/qjsengine.pro | 5 ----- tests/benchmarks/declarative/js/qjsengine/tst_qjsengine.cpp | 5 ----- .../qdeclarativecomponent/qdeclarativecomponent.pro | 10 ++-------- .../qdeclarativecomponent/tst_qdeclarativecomponent.cpp | 5 ----- .../declarative/qdeclarativeimage/qdeclarativeimage.pro | 8 +------- .../declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp | 5 ----- .../qdeclarativemetaproperty/qdeclarativemetaproperty.pro | 10 ++-------- .../tst_qdeclarativemetaproperty.cpp | 5 ----- tests/benchmarks/declarative/qmltime/qmltime.cpp | 11 ----------- tests/benchmarks/declarative/qmltime/qmltime.pro | 7 ------- tests/benchmarks/declarative/script/script.pro | 12 +----------- tests/benchmarks/declarative/script/tst_script.cpp | 5 ----- tests/benchmarks/declarative/typeimports/tst_typeimports.cpp | 5 ----- tests/benchmarks/declarative/typeimports/typeimports.pro | 8 +------- 22 files changed, 12 insertions(+), 143 deletions(-) (limited to 'tests/benchmarks') diff --git a/tests/benchmarks/declarative/binding/binding.pro b/tests/benchmarks/declarative/binding/binding.pro index bbe8701d32..c9567d3648 100644 --- a/tests/benchmarks/declarative/binding/binding.pro +++ b/tests/benchmarks/declarative/binding/binding.pro @@ -7,11 +7,5 @@ macx:CONFIG -= app_bundle SOURCES += tst_binding.cpp testtypes.cpp HEADERS += testtypes.h -symbian { - data.files = data - data.path = . - DEPLOYMENT += data -} else { - # Define SRCDIR equal to test's source directory - DEFINES += SRCDIR=\\\"$$PWD\\\" -} +# Define SRCDIR equal to test's source directory +DEFINES += SRCDIR=\\\"$$PWD\\\" diff --git a/tests/benchmarks/declarative/binding/tst_binding.cpp b/tests/benchmarks/declarative/binding/tst_binding.cpp index 70796f682a..c1b5035789 100644 --- a/tests/benchmarks/declarative/binding/tst_binding.cpp +++ b/tests/benchmarks/declarative/binding/tst_binding.cpp @@ -49,11 +49,6 @@ //TESTED_FILES= -#ifdef Q_OS_SYMBIAN -// In Symbian OS test data is located in applications private dir -#define SRCDIR "." -#endif - class tst_binding : public QObject { Q_OBJECT diff --git a/tests/benchmarks/declarative/compilation/compilation.pro b/tests/benchmarks/declarative/compilation/compilation.pro index 9ab2a25731..32f4aba52f 100644 --- a/tests/benchmarks/declarative/compilation/compilation.pro +++ b/tests/benchmarks/declarative/compilation/compilation.pro @@ -8,10 +8,4 @@ CONFIG += release SOURCES += tst_compilation.cpp -symbian { - data.files += data - data.path = . - DEPLOYMENT += data -} else { - DEFINES += SRCDIR=\\\"$$PWD\\\" -} +DEFINES += SRCDIR=\\\"$$PWD\\\" diff --git a/tests/benchmarks/declarative/compilation/tst_compilation.cpp b/tests/benchmarks/declarative/compilation/tst_compilation.cpp index 9b4f9a70e8..17200439f4 100644 --- a/tests/benchmarks/declarative/compilation/tst_compilation.cpp +++ b/tests/benchmarks/declarative/compilation/tst_compilation.cpp @@ -53,11 +53,6 @@ #include #include -#ifdef Q_OS_SYMBIAN -// In Symbian OS test data is located in applications private dir -#define SRCDIR "." -#endif - class tst_compilation : public QObject { Q_OBJECT diff --git a/tests/benchmarks/declarative/creation/creation.pro b/tests/benchmarks/declarative/creation/creation.pro index 4d6cafba49..a93eab8bac 100644 --- a/tests/benchmarks/declarative/creation/creation.pro +++ b/tests/benchmarks/declarative/creation/creation.pro @@ -6,12 +6,6 @@ macx:CONFIG -= app_bundle SOURCES += tst_creation.cpp -symbian { - data.files = data - data.path = . - DEPLOYMENT += data -} else { - DEFINES += SRCDIR=\\\"$$PWD\\\" -} +DEFINES += SRCDIR=\\\"$$PWD\\\" QT += core-private gui-private declarative-private qtquick1-private diff --git a/tests/benchmarks/declarative/creation/tst_creation.cpp b/tests/benchmarks/declarative/creation/tst_creation.cpp index 2ccdcb43bd..70099f669f 100644 --- a/tests/benchmarks/declarative/creation/tst_creation.cpp +++ b/tests/benchmarks/declarative/creation/tst_creation.cpp @@ -51,11 +51,6 @@ #include #include -#ifdef Q_OS_SYMBIAN -// In Symbian OS test data is located in applications private dir -#define SRCDIR "." -#endif - class tst_creation : public QObject { Q_OBJECT diff --git a/tests/benchmarks/declarative/holistic/holistic.pro b/tests/benchmarks/declarative/holistic/holistic.pro index fadb04db88..4be45f576a 100644 --- a/tests/benchmarks/declarative/holistic/holistic.pro +++ b/tests/benchmarks/declarative/holistic/holistic.pro @@ -10,10 +10,4 @@ SOURCES += tst_holistic.cpp \ testtypes.cpp HEADERS += testtypes.h -symbian { - data.files += data - data.path = . - DEPLOYMENT += data -} else { - DEFINES += SRCDIR=\\\"$$PWD\\\" -} +DEFINES += SRCDIR=\\\"$$PWD\\\" diff --git a/tests/benchmarks/declarative/holistic/tst_holistic.cpp b/tests/benchmarks/declarative/holistic/tst_holistic.cpp index 102a91cb25..88c7d52f56 100644 --- a/tests/benchmarks/declarative/holistic/tst_holistic.cpp +++ b/tests/benchmarks/declarative/holistic/tst_holistic.cpp @@ -49,11 +49,6 @@ #include #include -#ifdef Q_OS_SYMBIAN -// In Symbian OS test data is located in applications private dir -#define SRCDIR "." -#endif - // Conceptually, there are several different "holistic" areas to benchmark: // 1) Loading // - read file from disk diff --git a/tests/benchmarks/declarative/js/qjsengine/qjsengine.pro b/tests/benchmarks/declarative/js/qjsengine/qjsengine.pro index cbd128bf97..b82961886b 100644 --- a/tests/benchmarks/declarative/js/qjsengine/qjsengine.pro +++ b/tests/benchmarks/declarative/js/qjsengine/qjsengine.pro @@ -5,8 +5,3 @@ TARGET = tst_bench_qjsengine SOURCES += tst_qjsengine.cpp QT += declarative - -symbian* { - TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 // Min 128kB, Max 32MB - TARGET.EPOCSTACKSIZE = 0x14000 -} diff --git a/tests/benchmarks/declarative/js/qjsengine/tst_qjsengine.cpp b/tests/benchmarks/declarative/js/qjsengine/tst_qjsengine.cpp index f8bade3f9d..da5788e6fe 100644 --- a/tests/benchmarks/declarative/js/qjsengine/tst_qjsengine.cpp +++ b/tests/benchmarks/declarative/js/qjsengine/tst_qjsengine.cpp @@ -540,13 +540,8 @@ void tst_QJSEngine::nativeCall() newEngine(); m_engine->globalObject().setProperty("fun", m_engine->newFunction(native_function)); QBENCHMARK{ -#if !defined(Q_OS_SYMBIAN) m_engine->evaluate("var w = 0; for (i = 0; i < 100000; ++i) {\n" " w += fun() + fun(); w -= fun(); fun(); w -= fun(); }"); -#else - m_engine->evaluate("var w = 0; for (i = 0; i < 25000; ++i) {\n" - " w += fun() + fun(); w -= fun(); fun(); w -= fun(); }"); -#endif } } diff --git a/tests/benchmarks/declarative/qdeclarativecomponent/qdeclarativecomponent.pro b/tests/benchmarks/declarative/qdeclarativecomponent/qdeclarativecomponent.pro index 4693a82231..da5765a72d 100644 --- a/tests/benchmarks/declarative/qdeclarativecomponent/qdeclarativecomponent.pro +++ b/tests/benchmarks/declarative/qdeclarativecomponent/qdeclarativecomponent.pro @@ -7,11 +7,5 @@ macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativecomponent.cpp testtypes.cpp HEADERS += testtypes.h -symbian { - data.files = data - data.path = . - DEPLOYMENT += data -} else { - # Define SRCDIR equal to test's source directory - DEFINES += SRCDIR=\\\"$$PWD\\\" -} +# Define SRCDIR equal to test's source directory +DEFINES += SRCDIR=\\\"$$PWD\\\" diff --git a/tests/benchmarks/declarative/qdeclarativecomponent/tst_qdeclarativecomponent.cpp b/tests/benchmarks/declarative/qdeclarativecomponent/tst_qdeclarativecomponent.cpp index 94b096792f..1ff3e2db84 100644 --- a/tests/benchmarks/declarative/qdeclarativecomponent/tst_qdeclarativecomponent.cpp +++ b/tests/benchmarks/declarative/qdeclarativecomponent/tst_qdeclarativecomponent.cpp @@ -48,11 +48,6 @@ //TESTED_FILES= -#ifdef Q_OS_SYMBIAN -// In Symbian OS test data is located in applications private dir -#define SRCDIR "." -#endif - class tst_qmlcomponent : public QObject { Q_OBJECT diff --git a/tests/benchmarks/declarative/qdeclarativeimage/qdeclarativeimage.pro b/tests/benchmarks/declarative/qdeclarativeimage/qdeclarativeimage.pro index 0d7c184f37..71dfdf3f98 100644 --- a/tests/benchmarks/declarative/qdeclarativeimage/qdeclarativeimage.pro +++ b/tests/benchmarks/declarative/qdeclarativeimage/qdeclarativeimage.pro @@ -7,11 +7,5 @@ CONFIG += release SOURCES += tst_qdeclarativeimage.cpp -symbian { - importFiles.files = image.png - importFiles.path = - DEPLOYMENT += importFiles -} else { - DEFINES += SRCDIR=\\\"$$PWD\\\" -} +DEFINES += SRCDIR=\\\"$$PWD\\\" diff --git a/tests/benchmarks/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp b/tests/benchmarks/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp index 74bb35b055..2aade96143 100644 --- a/tests/benchmarks/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp +++ b/tests/benchmarks/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp @@ -44,11 +44,6 @@ #include #include -#ifdef Q_OS_SYMBIAN -// In Symbian OS test data is located in applications private dir -#define SRCDIR "." -#endif - class tst_qmlgraphicsimage : public QObject { Q_OBJECT diff --git a/tests/benchmarks/declarative/qdeclarativemetaproperty/qdeclarativemetaproperty.pro b/tests/benchmarks/declarative/qdeclarativemetaproperty/qdeclarativemetaproperty.pro index 765e37a15d..79fdd262cd 100644 --- a/tests/benchmarks/declarative/qdeclarativemetaproperty/qdeclarativemetaproperty.pro +++ b/tests/benchmarks/declarative/qdeclarativemetaproperty/qdeclarativemetaproperty.pro @@ -6,11 +6,5 @@ macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativemetaproperty.cpp -symbian { - data.files += data - data.path = . - DEPLOYMENT += data -} else { - # Define SRCDIR equal to test's source directory - DEFINES += SRCDIR=\\\"$$PWD\\\" -} +# Define SRCDIR equal to test's source directory +DEFINES += SRCDIR=\\\"$$PWD\\\" diff --git a/tests/benchmarks/declarative/qdeclarativemetaproperty/tst_qdeclarativemetaproperty.cpp b/tests/benchmarks/declarative/qdeclarativemetaproperty/tst_qdeclarativemetaproperty.cpp index ff18aa435e..05dd46a17f 100644 --- a/tests/benchmarks/declarative/qdeclarativemetaproperty/tst_qdeclarativemetaproperty.cpp +++ b/tests/benchmarks/declarative/qdeclarativemetaproperty/tst_qdeclarativemetaproperty.cpp @@ -48,11 +48,6 @@ //TESTED_FILES= -#ifdef Q_OS_SYMBIAN -// In Symbian OS test data is located in applications private dir -#define SRCDIR "." -#endif - class tst_qmlmetaproperty : public QObject { Q_OBJECT diff --git a/tests/benchmarks/declarative/qmltime/qmltime.cpp b/tests/benchmarks/declarative/qmltime/qmltime.cpp index d5a3c5a7c0..4e7ef3a995 100644 --- a/tests/benchmarks/declarative/qmltime/qmltime.cpp +++ b/tests/benchmarks/declarative/qmltime/qmltime.cpp @@ -247,11 +247,7 @@ int main(int argc, char ** argv) } if (filename.isEmpty()) -#ifdef Q_OS_SYMBIAN - filename = QLatin1String("./tests/item_creation/data.qml"); -#else usage(argv[0]); -#endif QDeclarativeEngine engine; QDeclarativeComponent component(&engine, filename); @@ -272,9 +268,6 @@ int main(int argc, char ** argv) return -1; } -#ifdef Q_OS_SYMBIAN - willParent = true; -#endif timer->setWillParent(willParent); if (!timer->component()) { @@ -282,10 +275,6 @@ int main(int argc, char ** argv) return -1; } -#ifdef Q_OS_SYMBIAN - iterations = 1024; -#endif - timer->run(iterations); return 0; diff --git a/tests/benchmarks/declarative/qmltime/qmltime.pro b/tests/benchmarks/declarative/qmltime/qmltime.pro index 273a60ac75..b077d1a38a 100644 --- a/tests/benchmarks/declarative/qmltime/qmltime.pro +++ b/tests/benchmarks/declarative/qmltime/qmltime.pro @@ -6,10 +6,3 @@ macx:CONFIG -= app_bundle SOURCES += qmltime.cpp -symbian { - TARGET.CAPABILITY = "All -TCB" - example.files = example.qml tests - example.path = . - DEPLOYMENT += example -} - diff --git a/tests/benchmarks/declarative/script/script.pro b/tests/benchmarks/declarative/script/script.pro index 01df571fda..71d448552c 100644 --- a/tests/benchmarks/declarative/script/script.pro +++ b/tests/benchmarks/declarative/script/script.pro @@ -7,14 +7,4 @@ CONFIG += release SOURCES += tst_script.cpp -symbian { - importFiles.files = data - importFiles.path = - DEPLOYMENT += importFiles -} else { - DEFINES += SRCDIR=\\\"$$PWD\\\" -} - - - - +DEFINES += SRCDIR=\\\"$$PWD\\\" diff --git a/tests/benchmarks/declarative/script/tst_script.cpp b/tests/benchmarks/declarative/script/tst_script.cpp index 4321b09b75..1ac51319e5 100644 --- a/tests/benchmarks/declarative/script/tst_script.cpp +++ b/tests/benchmarks/declarative/script/tst_script.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 - class tst_script : public QObject { Q_OBJECT diff --git a/tests/benchmarks/declarative/typeimports/tst_typeimports.cpp b/tests/benchmarks/declarative/typeimports/tst_typeimports.cpp index 16b54b5350..caa1777d0b 100644 --- a/tests/benchmarks/declarative/typeimports/tst_typeimports.cpp +++ b/tests/benchmarks/declarative/typeimports/tst_typeimports.cpp @@ -44,11 +44,6 @@ #include #include -#ifdef Q_OS_SYMBIAN -// In Symbian OS test data is located in applications private dir -#define SRCDIR "." -#endif - class tst_typeimports : public QObject { Q_OBJECT diff --git a/tests/benchmarks/declarative/typeimports/typeimports.pro b/tests/benchmarks/declarative/typeimports/typeimports.pro index 56834e6175..c18cbed773 100644 --- a/tests/benchmarks/declarative/typeimports/typeimports.pro +++ b/tests/benchmarks/declarative/typeimports/typeimports.pro @@ -6,10 +6,4 @@ macx:CONFIG -= app_bundle SOURCES += tst_typeimports.cpp -symbian { - data.files = data - data.path = . - DEPLOYMENT += data -} else { - DEFINES += SRCDIR=\\\"$$PWD\\\" -} \ No newline at end of file +DEFINES += SRCDIR=\\\"$$PWD\\\" -- cgit v1.2.3