Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt

Conflicts:
	doc/src/declarative/righttoleft.qdoc
	examples/draganddrop/fridgemagnets/main.cpp
	examples/script/context2d/main.cpp

1 files changed, 5 insertions, 4 deletions

diff --git a/examples/script/context2d/main.cpp b/examples/script/context2d/main.cpp
index b646869..20df178 100644
--- a/examples/script/context2d/main.cpp
+++ b/examples/script/context2d/main.cpp
@@ -48,16 +48,17 @@ int main(int argc, char **argv)
     QApplication app(argc, argv);
     Window win;
 
-    bool smallScreen = QApplication::arguments().contains("-small-screen");
-#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5)
-    win.showMaximized();
+#ifdef Q_OS_SYMBIAN
+    bool smallScreen = true;
 #else
+    bool smallScreen = QApplication::arguments().contains("-small-screen");
+#endif
+
     if (!smallScreen) {
         win.show();
     } else {
         win.showFullScreen();
     }
-#endif
 
     return app.exec();
 }