diff --git a/src/plugins/qmldesigner/CMakeLists.txt b/src/plugins/qmldesigner/CMakeLists.txt index 5483ceca4cb..36bba76777f 100644 --- a/src/plugins/qmldesigner/CMakeLists.txt +++ b/src/plugins/qmldesigner/CMakeLists.txt @@ -1049,7 +1049,6 @@ extend_qtc_plugin(QmlDesigner timelineactions.cpp timelineactions.h timelineanimationform.cpp timelineanimationform.h timelineconstants.h - timelinecontext.cpp timelinecontext.h timelinecontrols.cpp timelinecontrols.h timelineform.cpp timelineform.h timelinegraphicslayout.cpp timelinegraphicslayout.h diff --git a/src/plugins/qmldesigner/components/timelineeditor/timelinecontext.cpp b/src/plugins/qmldesigner/components/timelineeditor/timelinecontext.cpp deleted file mode 100644 index 250a7659fb3..00000000000 --- a/src/plugins/qmldesigner/components/timelineeditor/timelinecontext.cpp +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright (C) 2018 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 - -#include "timelinecontext.h" -#include "timelineconstants.h" -#include "timelinewidget.h" - -namespace QmlDesigner { - -TimelineContext::TimelineContext(QWidget *widget) - : IContext(widget) -{ - setWidget(widget); - setContext(Core::Context(TimelineConstants::C_QMLTIMELINE)); - setContextHelpProvider([this](const Core::IContext::HelpCallback &callback) { - if (auto *widget = qobject_cast(m_widget)) - widget->contextHelp(callback); - }); -} - -} // namespace QmlDesigner diff --git a/src/plugins/qmldesigner/components/timelineeditor/timelinecontext.h b/src/plugins/qmldesigner/components/timelineeditor/timelinecontext.h deleted file mode 100644 index a6b9ff0a707..00000000000 --- a/src/plugins/qmldesigner/components/timelineeditor/timelinecontext.h +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright (C) 2018 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 - -#pragma once - -#include - -#include - -namespace QmlDesigner { - -class TimelineContext : public Core::IContext -{ - Q_OBJECT - -public: - explicit TimelineContext(QWidget *widget); -}; - -} // namespace QmlDesigner diff --git a/src/plugins/qmldesigner/components/timelineeditor/timelineview.cpp b/src/plugins/qmldesigner/components/timelineeditor/timelineview.cpp index d2c46222214..098221bb34f 100644 --- a/src/plugins/qmldesigner/components/timelineeditor/timelineview.cpp +++ b/src/plugins/qmldesigner/components/timelineeditor/timelineview.cpp @@ -7,7 +7,6 @@ #include "easingcurve.h" #include "timelineactions.h" #include "timelineconstants.h" -#include "timelinecontext.h" #include "timelinewidget.h" #include "timelinegraphicsscene.h" @@ -640,13 +639,9 @@ void TimelineView::registerActions() TimelineWidget *TimelineView::createWidget() { - if (!m_timelineWidget) { + if (!m_timelineWidget) m_timelineWidget = new TimelineWidget(this); - auto *timelineContext = new TimelineContext(m_timelineWidget); - Core::ICore::addContextObject(timelineContext); - } - return m_timelineWidget; } diff --git a/src/plugins/qmldesigner/components/timelineeditor/timelinewidget.cpp b/src/plugins/qmldesigner/components/timelineeditor/timelinewidget.cpp index 592cf0dff93..5c34fe255c3 100644 --- a/src/plugins/qmldesigner/components/timelineeditor/timelinewidget.cpp +++ b/src/plugins/qmldesigner/components/timelineeditor/timelinewidget.cpp @@ -2,9 +2,7 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #include "timelinewidget.h" -#include "bindingproperty.h" #include "curvesegment.h" -#include "easingcurve.h" #include "easingcurvedialog.h" #include "timelineconstants.h" #include "timelinegraphicsscene.h" @@ -45,6 +43,8 @@ #include +using namespace Core; + namespace QmlDesigner { class Eventfilter : public QObject @@ -281,6 +281,9 @@ TimelineWidget::TimelineWidget(TimelineView *view) connect(m_playbackAnimation, &QVariantAnimation::finished, onFinish); TimeLineNS::TimelineScrollAreaSupport::support(m_graphicsView, m_scrollbar); + + IContext::attach(this, Context(TimelineConstants::C_QMLTIMELINE), + [this](const IContext::HelpCallback &callback) { contextHelp(callback); }); } void TimelineWidget::connectToolbar()