diff options
author | Matthew Vogt <matthew.vogt@nokia.com> | 2012-03-05 11:39:24 +1000 |
---|---|---|
committer | Matthew Vogt <matthew.vogt@nokia.com> | 2012-03-05 11:39:54 +1000 |
commit | 0284817d6cd7e17afa8da26ee6e9199100754446 (patch) | |
tree | c351d55d5a606c81c72e481f846b9b9e2603c883 /tools/qmlprofiler/qmlprofilerapplication.h | |
parent | 377eb94eb19dafeca20d12bc6b624f1779fae514 (diff) | |
parent | 36bd7f616f37f5f60e59bce1f0d8970248d627de (diff) |
Merge master <-> api_changes
Change-Id: Iad2f07b989b25349fd2d4fff010e24dcd5a1688f
Diffstat (limited to 'tools/qmlprofiler/qmlprofilerapplication.h')
-rw-r--r-- | tools/qmlprofiler/qmlprofilerapplication.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/qmlprofiler/qmlprofilerapplication.h b/tools/qmlprofiler/qmlprofilerapplication.h index 5bedb46cff..3937db7e5f 100644 --- a/tools/qmlprofiler/qmlprofilerapplication.h +++ b/tools/qmlprofiler/qmlprofilerapplication.h @@ -80,7 +80,7 @@ private slots: void logError(const QString &error); void logStatus(const QString &status); - void declarativeComplete(); + void qmlComplete(); void v8Complete(); private: @@ -104,13 +104,13 @@ private: bool m_quitAfterSave; QQmlDebugConnection m_connection; - DeclarativeProfileClient m_declarativeProfilerClient; + QmlProfileClient m_qmlProfilerClient; V8ProfileClient m_v8profilerClient; ProfileData m_profileData; QTimer m_connectTimer; uint m_connectionAttempts; - bool m_declarativeDataReady; + bool m_qmlDataReady; bool m_v8DataReady; }; |