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, 4 insertions, 3 deletions

diff --git a/examples/draganddrop/fridgemagnets/main.cpp b/examples/draganddrop/fridgemagnets/main.cpp
index 623e6d2..011440b 100644
--- a/examples/draganddrop/fridgemagnets/main.cpp
+++ b/examples/draganddrop/fridgemagnets/main.cpp
@@ -51,15 +51,16 @@ int main(int argc, char *argv[])
 #endif
     DragWidget window;
 
-#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
-    window.showMaximized();
+#ifdef Q_OS_SYMBIAN
+    bool smallScreen = true;
 #else
     bool smallScreen = QApplication::arguments().contains("-small-screen");
+#endif
+
     if (smallScreen)
         window.showFullScreen();
     else
         window.show();
-#endif
 
     return app.exec();
 }