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 ---- 4 files changed, 1 insertion(+), 14 deletions(-) (limited to 'examples/script') 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] -- cgit v1.2.1