diff options
| author | Tim Jenssen <tim.jenssen@qt.io> | 2020-08-13 08:34:24 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@qt.io> | 2020-08-13 06:39:40 +0000 |
| commit | 4fe5b923cddc9110094a883b5b7dd3051d8c8d90 (patch) | |
| tree | 34e3984ab983882423bc563542a041b99b35f065 /src/plugins/qmldesigner/components/timelineeditor | |
| parent | 24ca17f714ec133acc2bf0fd93c051ef730d69dc (diff) | |
| parent | dc870f538dd3e11464a3ece179edf024161e14ba (diff) | |
Merge remote-tracking branch 'origin/qds-1.59' into 4.13
Change-Id: Ic720f3adab305c5ef8cd10e713ccabf510eff0c0
Diffstat (limited to 'src/plugins/qmldesigner/components/timelineeditor')
| -rw-r--r-- | src/plugins/qmldesigner/components/timelineeditor/timelinetoolbar.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/qmldesigner/components/timelineeditor/timelinetoolbar.cpp b/src/plugins/qmldesigner/components/timelineeditor/timelinetoolbar.cpp index 39874f51b0..7d11f57cb3 100644 --- a/src/plugins/qmldesigner/components/timelineeditor/timelinetoolbar.cpp +++ b/src/plugins/qmldesigner/components/timelineeditor/timelinetoolbar.cpp @@ -103,7 +103,7 @@ static QAction *createAction(const Core::Id &id, TimelineToolBar::TimelineToolBar(QWidget *parent) : QToolBar(parent) , m_grp() - , m_dialog(new AnimationCurveDialog(Core::ICore::dialogParent())) + , m_dialog(new AnimationCurveDialog(this)) , m_curveModel(new AnimationCurveEditorModel(0., 500.)) { m_dialog->setModel(m_curveModel); |