diff options
| author | The Qt Project <gerrit-noreply@qt-project.org> | 2024-04-23 14:09:06 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2024-04-23 14:09:06 +0000 |
| commit | a86892b8af6c6169a7143d51a5d077f24573c6d2 (patch) | |
| tree | e9750e1ff09259af3ce476f39439103c2424cdfe /src/plugins/qmldesigner/designercore/model/texttomodelmerger.h | |
| parent | a7f92dd8bec1fd61c886ca039508ff6238211e5e (diff) | |
| parent | ef0ee52bf92739bc5b32d70c01ff1eadd752d813 (diff) | |
Merge "Merge remote-tracking branch 'origin/qds/dev'"
Diffstat (limited to 'src/plugins/qmldesigner/designercore/model/texttomodelmerger.h')
| -rw-r--r-- | src/plugins/qmldesigner/designercore/model/texttomodelmerger.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.h b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.h index f511906040..e22f747718 100644 --- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.h +++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.h @@ -37,15 +37,19 @@ public: bool isActive() const; void setupImports(const QmlJS::Document::Ptr &doc, DifferenceHandler &differenceHandler); +#ifndef QDS_USE_PROJECTSTORAGE void setupPossibleImports(); +#endif void setupUsedImports(); bool load(const QString &data, DifferenceHandler &differenceHandler); RewriterView *view() const { return m_rewriterView; } +#ifndef QDS_USE_PROJECTSTORAGE const QmlJS::ScopeChain *scopeChain() const { return m_scopeChain.data(); } +#endif const QmlJS::Document *document() const { return m_document.data(); } @@ -141,7 +145,9 @@ private: private: RewriterView *m_rewriterView; bool m_isActive; +#ifndef QDS_USE_PROJECTSTORAGE QSharedPointer<const QmlJS::ScopeChain> m_scopeChain; +#endif QmlJS::Document::Ptr m_document; QTimer m_setupTimer; QSet<ModelNode> m_setupComponentList; |