Remove dead performance measurement code from QML

8 files changed, 2 insertions, 31 deletions

diff --git a/src/declarative/qml/qdeclarativebinding.cpp b/src/declarative/qml/qdeclarativebinding.cpp
index 090bd5b..a7047ab 100644
--- a/src/declarative/qml/qdeclarativebinding.cpp
+++ b/src/declarative/qml/qdeclarativebinding.cpp
@@ -49,8 +49,6 @@
 #include "qdeclarativedeclarativedata_p.h"
 #include "qdeclarativestringconverters_p.h"
 
-#include <qfxperf_p_p.h>
-
 #include <QVariant>
 #include <QtCore/qdebug.h>
 
@@ -126,9 +124,6 @@ void QDeclarativeBinding::update(QDeclarativePropertyPrivate::WriteFlags flags)
 {
     Q_D(QDeclarativeBinding);
 
-#ifdef Q_ENABLE_PERFORMANCE_LOG
-    QDeclarativePerfTimer<QDeclarativePerf::BindableValueUpdate> bu;
-#endif
     QDeclarativeBindingData *data = d->bindingData();
 
     if (!data->enabled)
diff --git a/src/declarative/qml/qdeclarativecompiler.cpp b/src/declarative/qml/qdeclarativecompiler.cpp
index 42d2950..103e918 100644
--- a/src/declarative/qml/qdeclarativecompiler.cpp
+++ b/src/declarative/qml/qdeclarativecompiler.cpp
@@ -67,8 +67,6 @@
 #include "qdeclarativecompiledbindings_p.h"
 #include "qdeclarativeglobalscriptclass_p.h"
 
-#include <qfxperf_p_p.h>
-
 #include <QCoreApplication>
 #include <QColor>
 #include <QDebug>
@@ -77,6 +75,7 @@
 #include <QRectF>
 #include <QAtomicInt>
 #include <QtCore/qdebug.h>
+#include <QtCore/qdatetime.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -546,9 +545,6 @@ bool QDeclarativeCompiler::compile(QDeclarativeEngine *engine,
                           QDeclarativeCompositeTypeData *unit,
                           QDeclarativeCompiledData *out)
 {
-#ifdef Q_ENABLE_PERFORMANCE_LOG
-    QDeclarativePerfTimer<QDeclarativePerf::Compilation> pc;
-#endif
     exceptions.clear();
 
     Q_ASSERT(out);
diff --git a/src/declarative/qml/qdeclarativecomponent.cpp b/src/declarative/qml/qdeclarativecomponent.cpp
index 8922751..ec595e3 100644
--- a/src/declarative/qml/qdeclarativecomponent.cpp
+++ b/src/declarative/qml/qdeclarativecomponent.cpp
@@ -54,8 +54,6 @@
 #include "qdeclarativeglobal_p.h"
 #include "qdeclarativescriptparser_p.h"
 
-#include <qfxperf_p_p.h>
-
 #include <QStack>
 #include <QStringList>
 #include <QFileInfo>
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp
index f49b17d..5820961 100644
--- a/src/declarative/qml/qdeclarativeengine.cpp
+++ b/src/declarative/qml/qdeclarativeengine.cpp
@@ -69,8 +69,6 @@
 #include "qdeclarativelist_p.h"
 #include "qdeclarativetypenamecache_p.h"
 
-#include <qfxperf_p_p.h>
-
 #include <QtCore/qmetaobject.h>
 #include <QScriptClass>
 #include <QNetworkReply>
diff --git a/src/declarative/qml/qdeclarativeexpression.cpp b/src/declarative/qml/qdeclarativeexpression.cpp
index 9eed345..b7ee3a4 100644
--- a/src/declarative/qml/qdeclarativeexpression.cpp
+++ b/src/declarative/qml/qdeclarativeexpression.cpp
@@ -353,10 +353,6 @@ void QDeclarativeExpressionPrivate::exceptionToError(QScriptEngine *scriptEngine
 
 QVariant QDeclarativeExpressionPrivate::evalQtScript(QObject *secondaryScope, bool *isUndefined)
 {
-#ifdef Q_ENABLE_PERFORMANCE_LOG
-    QDeclarativePerfTimer<QDeclarativePerf::BindValueQt> perfqt;
-#endif
-
     QDeclarativeExpressionData *data = this->data;
     QDeclarativeEngine *engine = data->context()->engine;
     QDeclarativeEnginePrivate *ep = QDeclarativeEnginePrivate::get(engine);
@@ -466,10 +462,6 @@ QVariant QDeclarativeExpressionPrivate::value(QObject *secondaryScope, bool *isU
     if (data->expression.isEmpty())
         return rv;
 
-#ifdef Q_ENABLE_PERFORMANCE_LOG
-    QDeclarativePerfTimer<QDeclarativePerf::BindValue> perf;
-#endif
-
     QDeclarativeEnginePrivate *ep = QDeclarativeEnginePrivate::get(q->engine());
 
     QDeclarativeExpression *lastCurrentExpression = ep->currentExpression;
diff --git a/src/declarative/qml/qdeclarativeparser.cpp b/src/declarative/qml/qdeclarativeparser.cpp
index 51f1660..6e6080e 100644
--- a/src/declarative/qml/qdeclarativeparser.cpp
+++ b/src/declarative/qml/qdeclarativeparser.cpp
@@ -52,8 +52,6 @@
 #include "parser/qdeclarativejsast_p.h"
 #include "parser/qdeclarativejsengine_p.h"
 
-#include <qfxperf_p_p.h>
-
 #include <QStack>
 #include <QColor>
 #include <QPointF>
diff --git a/src/declarative/qml/qdeclarativescriptparser.cpp b/src/declarative/qml/qdeclarativescriptparser.cpp
index fe516c5..2578ff4 100644
--- a/src/declarative/qml/qdeclarativescriptparser.cpp
+++ b/src/declarative/qml/qdeclarativescriptparser.cpp
@@ -50,8 +50,6 @@
 #include "parser/qdeclarativejsast_p.h"
 #include "qdeclarativerewrite_p.h"
 
-#include <qfxperf_p_p.h>
-
 #include <QStack>
 #include <QCoreApplication>
 #include <QtDebug>
@@ -866,9 +864,6 @@ public:
 
 bool QDeclarativeScriptParser::parse(const QByteArray &qmldata, const QUrl &url)
 {
-#ifdef Q_ENABLE_PERFORMANCE_LOG
-    QDeclarativePerfTimer<QDeclarativePerf::QDeclarativeParsing> pt;
-#endif
     clear();
 
     const QString fileName = url.toString();
diff --git a/src/declarative/qml/qdeclarativevme.cpp b/src/declarative/qml/qdeclarativevme.cpp
index 4457404..b3144a8 100644
--- a/src/declarative/qml/qdeclarativevme.cpp
+++ b/src/declarative/qml/qdeclarativevme.cpp
@@ -61,8 +61,6 @@
 #include "qdeclarativeglobal_p.h"
 #include "qdeclarativescriptstring.h"
 
-#include <qfxperf_p_p.h>
-
 #include <QStack>
 #include <QWidget>
 #include <QColor>
@@ -72,6 +70,7 @@
 #include <QtCore/qdebug.h>
 #include <QtCore/qvarlengtharray.h>
 #include <QtCore/qcoreapplication.h>
+#include <QtCore/qdatetime.h>
 
 QT_BEGIN_NAMESPACE