Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6

1 files changed, 12 insertions, 1 deletions

diff --git a/examples/script/context2d/main.cpp b/examples/script/context2d/main.cpp
index 2f195c9..2c3c623 100644
--- a/examples/script/context2d/main.cpp
+++ b/examples/script/context2d/main.cpp
@@ -46,8 +46,19 @@ int main(int argc, char **argv)
 {
     Q_INIT_RESOURCE(context2d);
 
+    bool smallScreen = false;
+    for (int i = 0; i < argc; i++)
+        if (QString(argv[i]) == "-small-screen")
+            smallScreen = true;
+
     QApplication app(argc, argv);
     Window win;
-    win.show();
+
+    if (!smallScreen) {
+        win.show();
+    } else {
+        win.showFullScreen();
+    }
+
     return app.exec();
 }