From c46ca844fc877fc3613465222d882dfcbdc98fb5 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Tue, 1 Sep 2020 15:02:15 +0200 Subject: [PATCH] QmlDesigner: Fix for macOS issue Task-number: QDS-2708 Change-Id: If7a2f850b9ada74f590574214f7bd1384e3f67e0 Reviewed-by: Knud Dollereder Reviewed-by: Thomas Hartmann --- .../components/timelineeditor/splineeditor.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/plugins/qmldesigner/components/timelineeditor/splineeditor.cpp b/src/plugins/qmldesigner/components/timelineeditor/splineeditor.cpp index 44ef1f194c4..e6d6be4fb60 100644 --- a/src/plugins/qmldesigner/components/timelineeditor/splineeditor.cpp +++ b/src/plugins/qmldesigner/components/timelineeditor/splineeditor.cpp @@ -207,20 +207,20 @@ void SplineEditor::contextMenuEvent(QContextMenuEvent *e) { m_curve.clearActive(); - QMenu menu; + auto *menu = new QMenu(this); EasingCurve mappedCurve = m_canvas.mapTo(m_curve); int index = mappedCurve.hit(e->pos(), 10); if (index > 0 && !m_curve.isHandle(index)) { - QAction *deleteAction = menu.addAction(tr("Delete Point")); + QAction *deleteAction = menu->addAction(tr("Delete Point")); connect(deleteAction, &QAction::triggered, [this, index]() { m_curve.deletePoint(index); update(); emit easingCurveChanged(m_curve); }); - QAction *smoothAction = menu.addAction(tr("Smooth Point")); + QAction *smoothAction = menu->addAction(tr("Smooth Point")); smoothAction->setCheckable(true); smoothAction->setChecked(m_curve.isSmooth(index)); connect(smoothAction, &QAction::triggered, [this, index]() { @@ -229,7 +229,7 @@ void SplineEditor::contextMenuEvent(QContextMenuEvent *e) emit easingCurveChanged(m_curve); }); - QAction *cornerAction = menu.addAction(tr("Corner Point")); + QAction *cornerAction = menu->addAction(tr("Corner Point")); connect(cornerAction, &QAction::triggered, [this, index]() { m_curve.breakTangent(index); update(); @@ -237,7 +237,7 @@ void SplineEditor::contextMenuEvent(QContextMenuEvent *e) }); } else { - QAction *addAction = menu.addAction(tr("Add Point")); + QAction *addAction = menu->addAction(tr("Add Point")); connect(addAction, &QAction::triggered, [&]() { m_curve.addPoint(m_canvas.mapFrom(e->pos())); m_curve.makeSmooth(m_curve.active()); @@ -246,13 +246,13 @@ void SplineEditor::contextMenuEvent(QContextMenuEvent *e) }); } - QAction *zoomAction = menu.addAction(tr("Reset Zoom")); + QAction *zoomAction = menu->addAction(tr("Reset Zoom")); connect(zoomAction, &QAction::triggered, [&]() { m_canvas.setScale(1.0); update(); }); - menu.exec(e->globalPos()); + menu->exec(e->globalPos()); e->accept(); }