diff --git a/src/libs/qmldebug/qmlprofilertraceclient.cpp b/src/libs/qmldebug/qmlprofilertraceclient.cpp index 19f19c3b77f..bb1bd59a225 100644 --- a/src/libs/qmldebug/qmlprofilertraceclient.cpp +++ b/src/libs/qmldebug/qmlprofilertraceclient.cpp @@ -157,10 +157,8 @@ void QmlProfilerTraceClient::setRequestedFeatures(quint64 features) connect(d->messageClient.data(), &QDebugMessageClient::message, this, [this](QtMsgType type, const QString &text, const QmlDebug::QDebugContextInfo &context) { - emit this->rangedEvent(QmlDebug::DebugMessage, QmlDebug::MaximumRangeType, - type, context.timestamp, 0, text, - QmlDebug::QmlEventLocation(context.file, context.line, 1), 0, 0, - 0, 0, 0); + emit debugMessage(type, context.timestamp, text, + QmlDebug::QmlEventLocation(context.file, context.line, 1)); }); } else { d->messageClient.reset(); diff --git a/src/libs/qmldebug/qmlprofilertraceclient.h b/src/libs/qmldebug/qmlprofilertraceclient.h index 48c913fbb2d..3dbb86d1236 100644 --- a/src/libs/qmldebug/qmlprofilertraceclient.h +++ b/src/libs/qmldebug/qmlprofilertraceclient.h @@ -73,6 +73,8 @@ signals: qint64 length, const QString &data, const QmlDebug::QmlEventLocation &location, qint64 param1, qint64 param2, qint64 param3, qint64 param4, qint64 param5); + void debugMessage(QtMsgType type, qint64 timestamp, const QString &text, + const QmlDebug::QmlEventLocation &location); void recordingChanged(bool arg); void recordedFeaturesChanged(quint64 features); diff --git a/src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp b/src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp index 00110b060f8..e60cacf3c12 100644 --- a/src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp +++ b/src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp @@ -187,6 +187,8 @@ void QmlProfilerClientManager::connectClientSignals() this, &QmlProfilerClientManager::qmlComplete); connect(d->qmlclientplugin.data(), &QmlProfilerTraceClient::rangedEvent, d->modelManager, &QmlProfilerModelManager::addQmlEvent); + connect(d->qmlclientplugin.data(), &QmlProfilerTraceClient::debugMessage, + d->modelManager, &QmlProfilerModelManager::addDebugMessage); connect(d->qmlclientplugin.data(), &QmlProfilerTraceClient::traceFinished, d->modelManager->traceTime(), &QmlProfilerTraceTime::increaseEndTime); connect(d->qmlclientplugin.data(), &QmlProfilerTraceClient::traceStarted, @@ -209,6 +211,8 @@ void QmlProfilerClientManager::disconnectClientSignals() this, &QmlProfilerClientManager::qmlComplete); disconnect(d->qmlclientplugin.data(), &QmlProfilerTraceClient::rangedEvent, d->modelManager, &QmlProfilerModelManager::addQmlEvent); + disconnect(d->qmlclientplugin.data(), &QmlProfilerTraceClient::debugMessage, + d->modelManager, &QmlProfilerModelManager::addDebugMessage); disconnect(d->qmlclientplugin.data(), &QmlProfilerTraceClient::traceFinished, d->modelManager->traceTime(), &QmlProfilerTraceTime::increaseEndTime); disconnect(d->qmlclientplugin.data(), &QmlProfilerTraceClient::traceStarted, diff --git a/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp b/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp index 90e035b86b5..8945675e051 100644 --- a/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp +++ b/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp @@ -296,6 +296,14 @@ void QmlProfilerModelManager::addQmlEvent(QmlDebug::Message message, ndata1, ndata2, ndata3, ndata4, ndata5); } +void QmlProfilerModelManager::addDebugMessage(QtMsgType type, qint64 timestamp, const QString &text, + const QmlDebug::QmlEventLocation &location) +{ + if (state() == AcquiringData) + d->model->addQmlEvent(QmlDebug::DebugMessage, QmlDebug::MaximumRangeType, type, timestamp, + 0, text, location, 0, 0, 0, 0, 0); +} + void QmlProfilerModelManager::acquiringDone() { QTC_ASSERT(state() == AcquiringData, /**/); diff --git a/src/plugins/qmlprofiler/qmlprofilermodelmanager.h b/src/plugins/qmlprofiler/qmlprofilermodelmanager.h index 19ab0e5f39a..11e7763f273 100644 --- a/src/plugins/qmlprofiler/qmlprofilermodelmanager.h +++ b/src/plugins/qmlprofiler/qmlprofilermodelmanager.h @@ -135,6 +135,8 @@ public slots: qint64 startTime, qint64 length, const QString &data, const QmlDebug::QmlEventLocation &location, qint64 ndata1, qint64 ndata2, qint64 ndata3, qint64 ndata4, qint64 ndata5); + void addDebugMessage(QtMsgType type, qint64 timestamp, const QString &text, + const QmlDebug::QmlEventLocation &location); void save(const QString &filename); void load(const QString &filename);