summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2016-04-05 18:24:44 +0200
committerOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2016-04-06 09:43:13 +0000
commit55f2fe374f0314e87e1ca5618bab6fac94430c78 (patch)
treec3081b258ef95c597e29b6dbe56a042d6a7341d8 /examples
parenta775b9da4794f1f248b63a4a58ee6ad6885f0622 (diff)
downloadqtscript-55f2fe374f0314e87e1ca5618bab6fac94430c78.tar.gz
purge symbian vestiges
Change-Id: I3e66ce25ea21aa846b44b6f99b8afbe0959a6526 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
Diffstat (limited to 'examples')
-rw-r--r--examples/script/context2d/main.cpp2
-rw-r--r--examples/script/context2d/qcontext2dcanvas.cpp5
-rw-r--r--examples/script/defaultprototypes/main.cpp4
-rw-r--r--examples/script/helloscript/main.cpp4
4 files changed, 1 insertions, 14 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]