diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-03-22 04:11:01 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-03-22 04:11:01 (GMT) |
| commit | 563cd3b737d8ccfa02db536debd077b8b92e9aa4 (patch) | |
| tree | e8e7edfd7034ae822c51670350e47090a9b3c19b /src/declarative/util/qdeclarativeview.cpp | |
| parent | c1958338bb94f045c846147bdb7224377a2122a6 (diff) | |
| parent | e338b7efadc24619129e421aea31e06b948b0f12 (diff) | |
| download | Qt-563cd3b737d8ccfa02db536debd077b8b92e9aa4.zip Qt-563cd3b737d8ccfa02db536debd077b8b92e9aa4.tar.gz Qt-563cd3b737d8ccfa02db536debd077b8b92e9aa4.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/declarative/util/qdeclarativeview.cpp')
| -rw-r--r-- | src/declarative/util/qdeclarativeview.cpp | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/src/declarative/util/qdeclarativeview.cpp b/src/declarative/util/qdeclarativeview.cpp index 59a062a..c2dbf92 100644 --- a/src/declarative/util/qdeclarativeview.cpp +++ b/src/declarative/util/qdeclarativeview.cpp @@ -41,9 +41,6 @@ #include "qdeclarativeview.h" -#include "qperformancelog_p_p.h" -#include "qfxperf_p_p.h" - #include <qdeclarative.h> #include <qdeclarativeitem.h> #include <qdeclarativeengine.h> @@ -251,13 +248,6 @@ QDeclarativeView::QDeclarativeView(const QUrl &source, QWidget *parent) void QDeclarativeViewPrivate::init() { -#ifdef Q_ENABLE_PERFORMANCE_LOG - { - QDeclarativePerfTimer<QDeclarativePerf::FontDatabase> perf; - QFontDatabase database; - } -#endif - q->setScene(&scene); q->setOptimizationFlags(QGraphicsView::DontSavePainterState); @@ -455,8 +445,6 @@ void QDeclarativeView::setRootObject(QObject *obj) if (QDeclarativeItem *item = qobject_cast<QDeclarativeItem *>(obj)) { d->scene.addItem(item); - QPerformanceLog::displayData(); - QPerformanceLog::clear(); d->root = item; d->qmlRoot = item; connect(item, SIGNAL(widthChanged(qreal)), this, SLOT(sizeChanged())); |