diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-02-23 23:31:31 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-02-23 23:31:31 (GMT) |
| commit | ec7ac34b4a6b1a330460838acc74a53d29f62a7c (patch) | |
| tree | 5505189d15ce0a1f3b67f4cd65e4c39766080a1d /tools | |
| parent | 8727985d81c793d52d5e24ed6815e7237ae879f1 (diff) | |
| parent | d19f691a5646725c69b232e2adde8c2f961eb571 (diff) | |
| download | Qt-ec7ac34b4a6b1a330460838acc74a53d29f62a7c.zip Qt-ec7ac34b4a6b1a330460838acc74a53d29f62a7c.tar.gz Qt-ec7ac34b4a6b1a330460838acc74a53d29f62a7c.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
Conflicts:
src/declarative/util/qmlanimation.cpp
src/declarative/util/qmlxmllistmodel.cpp
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qmlviewer/qmlviewer.cpp | 6 | ||||
| -rw-r--r-- | tools/qmlviewer/qmlviewer.pro | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tools/qmlviewer/qmlviewer.cpp b/tools/qmlviewer/qmlviewer.cpp index 4fe7d7d..789c960 100644 --- a/tools/qmlviewer/qmlviewer.cpp +++ b/tools/qmlviewer/qmlviewer.cpp @@ -1061,11 +1061,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" } |