Squashed commit of the changes from the mobile-examples repository

(4.7-generated-declarative branch).
(cherry picked from commit 539311f7b2687e3148ea695ce06fee768abe7b44)

3 files changed, 8 insertions, 2 deletions

diff --git a/examples/script/context2d/context2d.pro b/examples/script/context2d/context2d.pro
index 58bc6ab..de1287a 100644
--- a/examples/script/context2d/context2d.pro
+++ b/examples/script/context2d/context2d.pro
@@ -30,3 +30,5 @@ symbian:{
     contextScripts.files = scripts
     DEPLOYMENT += contextScripts
 }
+maemo5: include($$QT_SOURCE_TREE/examples/maemo5pkgrules.pri)
+
diff --git a/examples/script/context2d/main.cpp b/examples/script/context2d/main.cpp
index 3d56910..b646869 100644
--- a/examples/script/context2d/main.cpp
+++ b/examples/script/context2d/main.cpp
@@ -49,11 +49,15 @@ 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)
+    win.showMaximized();
+#else
     if (!smallScreen) {
         win.show();
     } else {
         win.showFullScreen();
     }
+#endif
 
     return app.exec();
 }
diff --git a/examples/script/context2d/qcontext2dcanvas.cpp b/examples/script/context2d/qcontext2dcanvas.cpp
index bb08b79..f6799e8 100644
--- a/examples/script/context2d/qcontext2dcanvas.cpp
+++ b/examples/script/context2d/qcontext2dcanvas.cpp
@@ -84,8 +84,8 @@ void QContext2DCanvas::contentsChanged(const QImage &image)
 void QContext2DCanvas::paintEvent(QPaintEvent *e)
 {
     QPainter p(this);
-#ifdef Q_WS_S60
-// Draw white rect first since in with some themes the js-file content will produce black-on-black.
+#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