diff --git a/src/plugins/qmljseditor/qmljseditor.cpp b/src/plugins/qmljseditor/qmljseditor.cpp index ef99d338882..c0514808f18 100644 --- a/src/plugins/qmljseditor/qmljseditor.cpp +++ b/src/plugins/qmljseditor/qmljseditor.cpp @@ -35,10 +35,10 @@ #include "qmljshoverhandler.h" #include "qmljsquickfixassist.h" #include "qmloutlinemodel.h" +#include "quicktoolbar.h" #include #include -#include #include #include @@ -129,7 +129,7 @@ void QmlJSEditorWidget::finalizeInitialization() textDocument()->setCodec(QTextCodec::codecForName("UTF-8")); // qml files are defined to be utf-8 m_modelManager = ModelManagerInterface::instance(); - m_contextPane = ExtensionSystem::PluginManager::getObject(); + m_contextPane = QmlJSEditorPlugin::quickToolBar(); m_modelManager->activateScan(); diff --git a/src/plugins/qmljseditor/qmljseditor.h b/src/plugins/qmljseditor/qmljseditor.h index 3e055d69c08..f857acc8beb 100644 --- a/src/plugins/qmljseditor/qmljseditor.h +++ b/src/plugins/qmljseditor/qmljseditor.h @@ -43,13 +43,13 @@ QT_END_NAMESPACE namespace QmlJS { class ModelManagerInterface; - class IContextPane; namespace AST { class UiObjectMember; } } namespace QmlJSEditor { class QmlJSEditorDocument; +class QuickToolBar; class FindReferences; namespace Internal { @@ -124,7 +124,7 @@ private: QModelIndex m_outlineModelIndex; QmlJS::ModelManagerInterface *m_modelManager = nullptr; - QmlJS::IContextPane *m_contextPane = nullptr; + QuickToolBar *m_contextPane = nullptr; int m_oldCursorPosition = -1; FindReferences *m_findReferences; diff --git a/src/plugins/qmljseditor/qmljseditorplugin.cpp b/src/plugins/qmljseditor/qmljseditorplugin.cpp index 4c5b6172a70..129b21f1c7f 100644 --- a/src/plugins/qmljseditor/qmljseditorplugin.cpp +++ b/src/plugins/qmljseditor/qmljseditorplugin.cpp @@ -238,6 +238,12 @@ Utils::JsonSchemaManager *QmlJSEditorPlugin::jsonManager() return &m_instance->d->m_jsonManager; } +QuickToolBar *QmlJSEditorPlugin::quickToolBar() +{ + QTC_ASSERT(m_instance && m_instance->d, return new QuickToolBar()); + return &m_instance->d->m_quickToolBar; +} + void QmlJSEditorPluginPrivate::findUsages() { if (QmlJSEditorWidget *editor = qobject_cast(EditorManager::currentEditor()->widget())) diff --git a/src/plugins/qmljseditor/qmljseditorplugin.h b/src/plugins/qmljseditor/qmljseditorplugin.h index de7484525a3..0b6fbc26b4d 100644 --- a/src/plugins/qmljseditor/qmljseditorplugin.h +++ b/src/plugins/qmljseditor/qmljseditorplugin.h @@ -30,6 +30,7 @@ namespace Utils { class JsonSchemaManager; } namespace QmlJSEditor { +class QuickToolBar; namespace Internal { class QmlJSQuickFixAssistProvider; @@ -45,6 +46,7 @@ public: static QmlJSQuickFixAssistProvider *quickFixAssistProvider(); static Utils::JsonSchemaManager *jsonManager(); + static QuickToolBar *quickToolBar(); private: bool initialize(const QStringList &arguments, QString *errorMessage) final;