diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2016-05-17 10:42:57 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2016-05-17 10:24:42 +0000 |
| commit | 070897091ac12d01db3f6230e3e9c3af0507cfe5 (patch) | |
| tree | e15736b97812e6e6b16ce89f8c444b8e82e3e644 | |
| parent | f0dcda8592a0ba8f00d6c88d55e686007af1ca04 (diff) | |
| download | qt-creator-070897091ac12d01db3f6230e3e9c3af0507cfe5.tar.gz | |
QmlProfiler: Don't crash if there is no QmlJSModelManager
Change-Id: I63b978f0f9c42c8968da7e779cdff876c18d8f31
Task-number: QTCREATORBUG-16276
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
| -rw-r--r-- | src/plugins/qmlprofiler/qmlprofilerdetailsrewriter.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/plugins/qmlprofiler/qmlprofilerdetailsrewriter.cpp b/src/plugins/qmlprofiler/qmlprofilerdetailsrewriter.cpp index 192f7dbf0b..c664f8625f 100644 --- a/src/plugins/qmlprofiler/qmlprofilerdetailsrewriter.cpp +++ b/src/plugins/qmlprofiler/qmlprofilerdetailsrewriter.cpp @@ -150,10 +150,16 @@ void QmlProfilerDetailsRewriter::requestDetailsForLocation(int requestId, void QmlProfilerDetailsRewriter::reloadDocuments() { - if (!d->m_pendingDocs.isEmpty()) - QmlJS::ModelManagerInterface::instance()->updateSourceFiles(d->m_pendingDocs, false); - else + if (!d->m_pendingDocs.isEmpty()) { + if (QmlJS::ModelManagerInterface *manager = QmlJS::ModelManagerInterface::instance()) { + manager->updateSourceFiles(d->m_pendingDocs, false); + } else { + d->m_pendingDocs.clear(); + emit eventDetailsChanged(); + } + } else { emit eventDetailsChanged(); + } } void QmlProfilerDetailsRewriter::rewriteDetailsForLocation(QTextStream &textDoc, |