From 55f2fe374f0314e87e1ca5618bab6fac94430c78 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 5 Apr 2016 18:24:44 +0200 Subject: purge symbian vestiges Change-Id: I3e66ce25ea21aa846b44b6f99b8afbe0959a6526 Reviewed-by: Lars Knoll --- examples/script/context2d/main.cpp | 2 +- examples/script/context2d/qcontext2dcanvas.cpp | 5 ----- examples/script/defaultprototypes/main.cpp | 4 ---- examples/script/helloscript/main.cpp | 4 ---- tests/auto/qscriptengine/tst_qscriptengine.cpp | 6 ------ tests/auto/qscriptjstestsuite/expect_fail.txt | 9 --------- tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp | 4 ---- tests/benchmarks/script/qscriptengine/tst_qscriptengine.cpp | 5 ----- 8 files changed, 1 insertion(+), 38 deletions(-) diff --git a/examples/script/context2d/main.cpp b/examples/script/context2d/main.cpp index c34eaab..178cec1 100644 --- a/examples/script/context2d/main.cpp +++ b/examples/script/context2d/main.cpp @@ -49,7 +49,7 @@ int main(int argc, char **argv) Window win; bool smallScreen = QApplication::arguments().contains("-small-screen"); -#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) +#if defined(Q_WS_MAEMO_5) win.showMaximized(); #else if (!smallScreen) { diff --git a/examples/script/context2d/qcontext2dcanvas.cpp b/examples/script/context2d/qcontext2dcanvas.cpp index 9580b7f..af241b0 100644 --- a/examples/script/context2d/qcontext2dcanvas.cpp +++ b/examples/script/context2d/qcontext2dcanvas.cpp @@ -84,11 +84,6 @@ void QContext2DCanvas::contentsChanged(const QImage &image) void QContext2DCanvas::paintEvent(QPaintEvent *e) { QPainter p(this); -#ifdef Q_OS_SYMBIAN - // Draw white rect first since in with some themes the js-file content will produce black-on-black. - QBrush whiteBgBrush(Qt::white); - p.fillRect(e->rect(), whiteBgBrush); -#endif p.setClipRect(e->rect()); p.drawImage(0, 0, m_image); } diff --git a/examples/script/defaultprototypes/main.cpp b/examples/script/defaultprototypes/main.cpp index 5717f86..f9a135d 100644 --- a/examples/script/defaultprototypes/main.cpp +++ b/examples/script/defaultprototypes/main.cpp @@ -80,10 +80,6 @@ int main(int argc, char **argv) qWarning() << "line" << lineNo << ":" << result.toString(); } -#if defined(Q_OS_SYMBIAN) - listWidget.showMaximized(); -#else listWidget.show(); -#endif return app.exec(); } diff --git a/examples/script/helloscript/main.cpp b/examples/script/helloscript/main.cpp index fafa0f3..2af6e30 100644 --- a/examples/script/helloscript/main.cpp +++ b/examples/script/helloscript/main.cpp @@ -78,10 +78,6 @@ int main(int argc, char *argv[]) scriptFile.close(); //! [3] -#ifdef Q_OS_SYMBIAN - contents.replace("button.show()", "button.showMaximized()"); -#endif - //! [4] QScriptValue result = engine.evaluate(contents, fileName); //! [4] diff --git a/tests/auto/qscriptengine/tst_qscriptengine.cpp b/tests/auto/qscriptengine/tst_qscriptengine.cpp index dde048b..19a6f7e 100644 --- a/tests/auto/qscriptengine/tst_qscriptengine.cpp +++ b/tests/auto/qscriptengine/tst_qscriptengine.cpp @@ -51,12 +51,6 @@ Q_DECLARE_METATYPE(QList) Q_DECLARE_METATYPE(QObjectList) Q_DECLARE_METATYPE(QScriptProgram) -#if defined(Q_OS_SYMBIAN) -# define STRINGIFY(x) #x -# define TOSTRING(x) STRINGIFY(x) -# define SRCDIR "C:/Private/" TOSTRING(SYMBIAN_SRCDIR_UID) -#endif - class tst_QScriptEngine : public QObject { Q_OBJECT diff --git a/tests/auto/qscriptjstestsuite/expect_fail.txt b/tests/auto/qscriptjstestsuite/expect_fail.txt index b15542e..6fedd4a 100644 --- a/tests/auto/qscriptjstestsuite/expect_fail.txt +++ b/tests/auto/qscriptjstestsuite/expect_fail.txt @@ -197,12 +197,3 @@ ecma/Math/15.8.2.6.js | Infinity/Math.ceil(-0.9) ecma/Math/15.8.2.9.js | Infinity/Math.floor(-0) ecma/TypeConversion/9.3.1-3.js | var z = 0; print(1/-z) ecma/TypeConversion/9.3.1-3.js | 1/-1e-2000 - -[Q_OS_SYMBIAN] -ecma/Math/15.8.2.13.js | Math.pow(-1, 0.5) -ecma/Math/15.8.2.13.js | Math.pow(-1, -0.5) -ecma_3/Operators/order-01.js | operator evaluation order: 11.5.1 * -ecma_3/Operators/order-01.js | operator evaluation order: 11.5.2 / -ecma_3/Operators/order-01.js | operator evaluation order: 11.6.2 - -ecma_3/Operators/order-01.js | operator evaluation order: 11.13.2 *= -ecma_3/Operators/order-01.js | operator evaluation order: 11.13.2 /= diff --git a/tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp b/tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp index 13668c6..3ce2397 100644 --- a/tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp +++ b/tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp @@ -37,10 +37,6 @@ #include -#if defined(Q_OS_SYMBIAN) -# define SRCDIR "." -#endif - struct TestRecord { TestRecord() : lineNumber(-1) { } diff --git a/tests/benchmarks/script/qscriptengine/tst_qscriptengine.cpp b/tests/benchmarks/script/qscriptengine/tst_qscriptengine.cpp index 8149d7e..8fa7e04 100644 --- a/tests/benchmarks/script/qscriptengine/tst_qscriptengine.cpp +++ b/tests/benchmarks/script/qscriptengine/tst_qscriptengine.cpp @@ -478,13 +478,8 @@ void tst_QScriptEngine::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 } } -- cgit v1.2.1