summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorBea Lam <bea.lam@nokia.com>2010-02-23 23:43:06 (GMT)
committerBea Lam <bea.lam@nokia.com>2010-02-23 23:43:06 (GMT)
commit206b55e618945e7cfb428cfa7a7decbb3dc9f2e4 (patch)
tree600546d7cb8d2f9a18bbc98d29257d026a1e4888 /tools
parent2f1372b7a77d9e24d4a6f6925fe876b4e3a1b01a (diff)
parentd19f691a5646725c69b232e2adde8c2f961eb571 (diff)
downloadQt-206b55e618945e7cfb428cfa7a7decbb3dc9f2e4.zip
Qt-206b55e618945e7cfb428cfa7a7decbb3dc9f2e4.tar.gz
Qt-206b55e618945e7cfb428cfa7a7decbb3dc9f2e4.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
Diffstat (limited to 'tools')
-rw-r--r--tools/qmlviewer/qmlviewer.cpp6
-rw-r--r--tools/qmlviewer/qmlviewer.pro2
2 files changed, 4 insertions, 4 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) {
diff --git a/tools/qmlviewer/qmlviewer.pro b/tools/qmlviewer/qmlviewer.pro
index aba3cf5..2da244c 100644
--- a/tools/qmlviewer/qmlviewer.pro
+++ b/tools/qmlviewer/qmlviewer.pro
@@ -54,5 +54,5 @@ symbian {
TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
HEADERS += $$QT_SOURCE_TREE/examples/network/qftp/sym_iap_util.h
LIBS += -lesock -lconnmon -linsock
- TARGET.CAPABILITY = NetworkServices
+ TARGET.CAPABILITY = "All -TCB"
}