diff options
| author | Ulf Hermann <[email protected]> | 2014-06-03 16:57:32 +0200 |
|---|---|---|
| committer | Ulf Hermann <[email protected]> | 2014-06-06 15:24:28 +0200 |
| commit | 94722ec5e7e996c4a1c2f66ca184bcfdfb46d8de (patch) | |
| tree | 8e420197803c2446676332f0f4df616f48544be2 /src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp | |
| parent | 83df62061224fca7e7e4b65b53a6f9ceaae6454c (diff) | |
QmlProfiler: Unify event type definitions
Generally save both the Message and RangeType attributes so that we
avoid clashes between those types. Also keep all the types in one
place and make their names follow qtdeclarative's conventions.
Change-Id: I811bfcc4b72aaa2a0142babc92d96968ed2d4007
Reviewed-by: Kai Koehne <[email protected]>
Diffstat (limited to 'src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp')
| -rw-r--r-- | src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp b/src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp index ad57a88ed9d..828707828d3 100644 --- a/src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp +++ b/src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp @@ -175,11 +175,13 @@ void QmlProfilerClientManager::connectClientSignals() connect(d->qmlclientplugin.data(), SIGNAL(complete(qint64)), this, SLOT(qmlComplete(qint64))); connect(d->qmlclientplugin.data(), - SIGNAL(rangedEvent(int,int,qint64,qint64,QStringList,QmlDebug::QmlEventLocation, - qint64,qint64,qint64,qint64,qint64)), + SIGNAL(rangedEvent(QmlDebug::Message,QmlDebug::RangeType,int,qint64,qint64, + QStringList,QmlDebug::QmlEventLocation,qint64,qint64,qint64, + qint64,qint64)), d->modelManager, - SLOT(addQmlEvent(int,int,qint64,qint64,QStringList,QmlDebug::QmlEventLocation, - qint64,qint64,qint64,qint64,qint64))); + SLOT(addQmlEvent(QmlDebug::Message,QmlDebug::RangeType,int,qint64,qint64, + QStringList,QmlDebug::QmlEventLocation,qint64,qint64,qint64,qint64, + qint64))); connect(d->qmlclientplugin.data(), SIGNAL(traceFinished(qint64)), d->modelManager->traceTime(), SLOT(setEndTime(qint64))); connect(d->qmlclientplugin.data(), SIGNAL(traceStarted(qint64)), |