aboutsummaryrefslogtreecommitdiffstats
path: root/tools/qmlprofiler/profileclient.h
diff options
context:
space:
mode:
authorMatthew Vogt <matthew.vogt@nokia.com>2012-03-05 11:39:24 +1000
committerMatthew Vogt <matthew.vogt@nokia.com>2012-03-05 11:39:54 +1000
commit0284817d6cd7e17afa8da26ee6e9199100754446 (patch)
treec351d55d5a606c81c72e481f846b9b9e2603c883 /tools/qmlprofiler/profileclient.h
parent377eb94eb19dafeca20d12bc6b624f1779fae514 (diff)
parent36bd7f616f37f5f60e59bce1f0d8970248d627de (diff)
Merge master <-> api_changes
Diffstat (limited to 'tools/qmlprofiler/profileclient.h')
-rw-r--r--tools/qmlprofiler/profileclient.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/qmlprofiler/profileclient.h b/tools/qmlprofiler/profileclient.h
index fd581c59c4..8aa4e67982 100644
--- a/tools/qmlprofiler/profileclient.h
+++ b/tools/qmlprofiler/profileclient.h
@@ -83,13 +83,13 @@ protected:
bool m_enabled;
};
-class DeclarativeProfileClient : public ProfileClient
+class QmlProfileClient : public ProfileClient
{
Q_OBJECT
public:
- DeclarativeProfileClient(QQmlDebugConnection *client);
- ~DeclarativeProfileClient();
+ QmlProfileClient(QQmlDebugConnection *client);
+ ~QmlProfileClient();
public slots:
void clearData();
@@ -107,7 +107,7 @@ protected:
virtual void messageReceived(const QByteArray &);
private:
- class DeclarativeProfileClientPrivate *d;
+ class QmlProfileClientPrivate *d;
};
class V8ProfileClient : public ProfileClient