From a66a9cdf6eed479d2da65dd860d233b79c8601ec Mon Sep 17 00:00:00 2001
From: Warwick Allison <warwick.allison@nokia.com>
Date: Fri, 19 Jun 2009 11:23:07 +1000
Subject: For QSimpleCanvas, avoid it being given initial default size. See
 also 1312c0ca987b008d43558ff4cfa69b8dfd11616e

---
 tools/qmlviewer/main.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/tools/qmlviewer/main.cpp b/tools/qmlviewer/main.cpp
index 5c75656..0b370fb 100644
--- a/tools/qmlviewer/main.cpp
+++ b/tools/qmlviewer/main.cpp
@@ -154,11 +154,13 @@ int main(int argc, char ** argv)
         viewer.setDeviceKeys(true);
     viewer.setRecordDither(dither);
     viewer.setRecordArgs(recordargs);
-    viewer.show();
-    if (!fileName.isEmpty())
+    if (!fileName.isEmpty()) {
         viewer.openQml(fileName);
-    else
+        viewer.show();
+    } else {
+        viewer.show();
         viewer.open();
+    }
 
     return app.exec();
 }
-- 
cgit v0.12