summaryrefslogtreecommitdiffstats
path: root/tools/qmlviewer/main.cpp
diff options
context:
space:
mode:
authorWarwick Allison <warwick.allison@nokia.com>2009-06-19 01:23:07 (GMT)
committerWarwick Allison <warwick.allison@nokia.com>2009-06-19 01:23:07 (GMT)
commita66a9cdf6eed479d2da65dd860d233b79c8601ec (patch)
treeff008e72324d58f41b77c452f95533db2d977e0f /tools/qmlviewer/main.cpp
parent2164656f4f010950d38de65ee826520c66d15180 (diff)
downloadQt-a66a9cdf6eed479d2da65dd860d233b79c8601ec.zip
Qt-a66a9cdf6eed479d2da65dd860d233b79c8601ec.tar.gz
Qt-a66a9cdf6eed479d2da65dd860d233b79c8601ec.tar.bz2
For QSimpleCanvas, avoid it being given initial default size.
See also 1312c0ca987b008d43558ff4cfa69b8dfd11616e
Diffstat (limited to 'tools/qmlviewer/main.cpp')
-rw-r--r--tools/qmlviewer/main.cpp8
1 files 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();
}