summaryrefslogtreecommitdiffstats
path: root/tools/qmlviewer/main.cpp
diff options
context:
space:
mode:
authorWarwick Allison <warwick.allison@nokia.com>2010-01-05 05:55:58 (GMT)
committerWarwick Allison <warwick.allison@nokia.com>2010-01-05 05:55:58 (GMT)
commit027a3a94955127712a76f15430a1f6cc0288722e (patch)
tree20f5ff73b9dca7210e69f78c6f6a0c0ac088b415 /tools/qmlviewer/main.cpp
parent186cdd1c29f1c708455ec2f0771a6eb600d4a075 (diff)
downloadQt-027a3a94955127712a76f15430a1f6cc0288722e.zip
Qt-027a3a94955127712a76f15430a1f6cc0288722e.tar.gz
Qt-027a3a94955127712a76f15430a1f6cc0288722e.tar.bz2
Basic WGT/WGZ support.
Task-number: QT-524
Diffstat (limited to 'tools/qmlviewer/main.cpp')
-rw-r--r--tools/qmlviewer/main.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/qmlviewer/main.cpp b/tools/qmlviewer/main.cpp
index 412d3ef..d1ee733 100644
--- a/tools/qmlviewer/main.cpp
+++ b/tools/qmlviewer/main.cpp
@@ -326,14 +326,14 @@ int main(int argc, char ** argv)
if (fullScreen && maximized)
qWarning() << "Both -fullscreen and -maximized specified. Using -fullscreen.";
if (!fileName.isEmpty()) {
- viewer.openQml(fileName);
+ viewer.open(fileName);
fullScreen ? viewer.showFullScreen() : maximized ? viewer.showMaximized() : viewer.show();
} else {
if (!useNativeFileBrowser)
- viewer.open();
+ viewer.openFile();
fullScreen ? viewer.showFullScreen() : maximized ? viewer.showMaximized() : viewer.show();
if (useNativeFileBrowser)
- viewer.open();
+ viewer.openFile();
}
viewer.raise();