summaryrefslogtreecommitdiffstats
path: root/tools/qmlviewer/qmlviewer.cpp
diff options
context:
space:
mode:
authorRoberto Raggi <roberto.raggi@nokia.com>2010-02-23 08:44:01 (GMT)
committerRoberto Raggi <roberto.raggi@nokia.com>2010-02-23 08:44:01 (GMT)
commitab3a625e1bc03481f740a32cdbe8c4559cf7cb1e (patch)
tree01adb2ad207b9a2980492a24cb820925f7e48635 /tools/qmlviewer/qmlviewer.cpp
parent20fc9f2e264f34dd8580949ddbe5511b78ab0ac4 (diff)
parent48161233af2a6071bc0ba99e546da98f705b8281 (diff)
downloadQt-ab3a625e1bc03481f740a32cdbe8c4559cf7cb1e.zip
Qt-ab3a625e1bc03481f740a32cdbe8c4559cf7cb1e.tar.gz
Qt-ab3a625e1bc03481f740a32cdbe8c4559cf7cb1e.tar.bz2
Merge remote branch 'origin/master' into qtruntime
Diffstat (limited to 'tools/qmlviewer/qmlviewer.cpp')
-rw-r--r--tools/qmlviewer/qmlviewer.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/qmlviewer/qmlviewer.cpp b/tools/qmlviewer/qmlviewer.cpp
index 626e4c4..f881cd7 100644
--- a/tools/qmlviewer/qmlviewer.cpp
+++ b/tools/qmlviewer/qmlviewer.cpp
@@ -1063,11 +1063,11 @@ void QmlViewer::openQml(const QString& file_or_url)
}
}
- canvas->setSource(url);
-
QTime t;
t.start();
- canvas->execute();
+
+ canvas->setSource(url);
+
qWarning() << "Wall startup time:" << t.elapsed();
if (!skin) {