diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-10-05 09:05:23 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-10-05 09:05:23 +0200 |
| commit | ad7dbc46191e7a3d7308041fee426d35005a2a5f (patch) | |
| tree | e0ba0d59f2e8ff1be8849e273c2ef7f2bccf0dfb /src/plugins/qmldesigner | |
| parent | 48c56416f5e128c04f2d2d867b518775e0527607 (diff) | |
| parent | 2f584585e3c34871396c8dd1de4e4c03c1188492 (diff) | |
Merge remote-tracking branch 'origin/4.13' into master
Change-Id: I565a0bd783dc80b53d4715fdc153dba1f1d3f7c7
Diffstat (limited to 'src/plugins/qmldesigner')
| -rw-r--r-- | src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp index d23eac4f546..661af4781aa 100644 --- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp +++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp @@ -2179,6 +2179,9 @@ QSet<QPair<QString, QString> > TextToModelMerger::qrcMapping() const QList<QmlTypeData> TextToModelMerger::getQMLSingletons() const { QList<QmlTypeData> list; + if (!m_scopeChain || !m_scopeChain->document()) + return list; + const QmlJS::Imports *imports = m_scopeChain->context()->imports( m_scopeChain->document().data()); |