diff options
| author | Fawzi Mohamed <fawzi.mohamed@digia.com> | 2012-12-06 17:20:58 +0100 |
|---|---|---|
| committer | Fawzi Mohamed <fawzi.mohamed@digia.com> | 2013-02-21 17:22:16 +0100 |
| commit | 942326ae9bf96fc71264e2b31b106fa8622b831a (patch) | |
| tree | 387748bc658f25d29928431ea424d2e72606b9c3 /src/plugins/qmljstools/qmljsmodelmanager.h | |
| parent | 6d3c271d53200ce66f32339766d1638ad5248686 (diff) | |
qmljs: add infrastructure handling qml dialects better
QmlBundles enables us to treat the different qml
dialects differently.
Add imports completion.
Change-log: [Qml/JS Support] Corrected handling of QtQuick2 only features.
Change-log: [Qml/JS Support] Added import completion in editor.
Task-number: QTCREATORBUG-8750
Task-number: QTCREATORBUG-8624
Task-number: QTCREATORBUG-8584
Task-number: QTCREATORBUG-8583
Task-number: QTCREATORBUG-8429
Change-Id: I1384b1b23136a85b4d077895ea86f92960da9e71
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Diffstat (limited to 'src/plugins/qmljstools/qmljsmodelmanager.h')
| -rw-r--r-- | src/plugins/qmljstools/qmljsmodelmanager.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/plugins/qmljstools/qmljsmodelmanager.h b/src/plugins/qmljstools/qmljsmodelmanager.h index 571ea8b055..3b0763f904 100644 --- a/src/plugins/qmljstools/qmljsmodelmanager.h +++ b/src/plugins/qmljstools/qmljsmodelmanager.h @@ -82,12 +82,15 @@ public: virtual ProjectInfo projectInfo(ProjectExplorer::Project *project) const; virtual void updateProjectInfo(const ProjectInfo &pinfo); Q_SLOT virtual void removeProjectInfo(ProjectExplorer::Project *project); + virtual ProjectInfo projectInfoForPath(QString path); void updateDocument(QmlJS::Document::Ptr doc); void updateLibraryInfo(const QString &path, const QmlJS::LibraryInfo &info); void emitDocumentChangedOnDisk(QmlJS::Document::Ptr doc); virtual QStringList importPaths() const; + virtual QmlJS::QmlLanguageBundles activeBundles() const; + virtual QmlJS::QmlLanguageBundles extendedBundles() const; virtual void loadPluginTypes(const QString &libraryPath, const QString &importPath, const QString &importUri, const QString &importVersion); @@ -136,6 +139,8 @@ private: QmlJS::Snapshot _newestSnapshot; QStringList m_allImportPaths; QStringList m_defaultImportPaths; + QmlJS::QmlLanguageBundles m_activeBundles; + QmlJS::QmlLanguageBundles m_extendedBundles; QFutureSynchronizer<void> m_synchronizer; @@ -153,6 +158,11 @@ private: }; } // namespace Internal + +QMLJSTOOLS_EXPORT QmlJS::ModelManagerInterface::ProjectInfo defaultProjectInfoForProject( + ProjectExplorer::Project *project); +QMLJSTOOLS_EXPORT void setupProjectInfoQmlBundles(QmlJS::ModelManagerInterface::ProjectInfo &projectInfo); + } // namespace QmlJSTools #endif // QMLJSMODELMANAGER_H |