diff --git a/src/plugins/effectcomposer/effectcomposerview.cpp b/src/plugins/effectcomposer/effectcomposerview.cpp index 4dc975e4045..7e854ac1e0b 100644 --- a/src/plugins/effectcomposer/effectcomposerview.cpp +++ b/src/plugins/effectcomposer/effectcomposerview.cpp @@ -18,18 +18,6 @@ namespace EffectComposer { -EffectComposerContext::EffectComposerContext(QWidget *widget) - : IContext(widget) -{ - setWidget(widget); - setContext(Core::Context(QmlDesigner::Constants::C_QMLEFFECTCOMPOSER, - QmlDesigner::Constants::C_QT_QUICK_TOOLS_MENU)); - - setContextHelpProvider([this](const HelpCallback &callback) { - qobject_cast(m_widget)->contextHelp(callback); - }); -} - EffectComposerView::EffectComposerView(QmlDesigner::ExternalDependenciesInterface &externalDependencies) : AbstractView{externalDependencies} , m_componentUtils(externalDependencies) @@ -116,9 +104,6 @@ QmlDesigner::WidgetInfo EffectComposerView::widgetInfo() document->clearUndoRedoStacks(); } }); - - auto context = new EffectComposerContext(m_widget.data()); - Core::ICore::addContextObject(context); } return createWidgetInfo(m_widget.data(), "EffectComposer", diff --git a/src/plugins/effectcomposer/effectcomposerview.h b/src/plugins/effectcomposer/effectcomposerview.h index e3900f04445..ff1cc616904 100644 --- a/src/plugins/effectcomposer/effectcomposerview.h +++ b/src/plugins/effectcomposer/effectcomposerview.h @@ -7,7 +7,6 @@ #include "modelnode.h" #include -#include #include @@ -15,14 +14,6 @@ namespace EffectComposer { class EffectComposerWidget; -class EffectComposerContext : public Core::IContext -{ - Q_OBJECT - -public: - EffectComposerContext(QWidget *widget); -}; - class EffectComposerView : public QmlDesigner::AbstractView { Q_DECLARE_TR_FUNCTIONS(EffectComposer::EffectComposerView) diff --git a/src/plugins/effectcomposer/effectcomposerwidget.cpp b/src/plugins/effectcomposer/effectcomposerwidget.cpp index 48bb5e410e1..ed93f3009bc 100644 --- a/src/plugins/effectcomposer/effectcomposerwidget.cpp +++ b/src/plugins/effectcomposer/effectcomposerwidget.cpp @@ -34,6 +34,8 @@ #include #include +using namespace Core; + namespace EffectComposer { static QString propertyEditorResourcesPath() @@ -128,8 +130,12 @@ EffectComposerWidget::EffectComposerWidget(EffectComposerView *view) m_effectComposerModel->saveComposition(compName); } }); -} + IContext::attach(this, + Context(QmlDesigner::Constants::C_QMLEFFECTCOMPOSER, + QmlDesigner::Constants::C_QT_QUICK_TOOLS_MENU), + [this](const IContext::HelpCallback &callback) { contextHelp(callback); }); +} bool EffectComposerWidget::eventFilter(QObject *obj, QEvent *event) {