feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Fix crash in QmlDesigner::TextEditor

Browse Source 
Change-Id: Ic511e5812bbe015f90f88f947faa50bb3461ae38
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Aleksei German
2023-11-21 18:28:41 +01:00
committed by Tim Jenssen
parent f2eee58e00
commit 1ed6674d1e
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/qmldesigner/components/texteditor/texteditorwidget.cpp
View File

@@ -78,10 +78,6 @@ void TextEditorWidget::setTextEditor(
}); });
m_textEditor->editorWidget()->installEventFilter(this); m_textEditor->editorWidget()->installEventFilter(this);
// do not call the eventfilter when the m_textEditor is gone
connect(m_textEditor->editorWidget(), &QObject::destroyed, this, [this](QObject *) {
m_textEditor->editorWidget()->removeEventFilter(this);
});
} }
} }
@@ -206,6 +202,10 @@ void TextEditorWidget::setBlockCursorSelectionSynchronisation(bool b)
bool TextEditorWidget::eventFilter(QObject *, QEvent *event) bool TextEditorWidget::eventFilter(QObject *, QEvent *event)
{ {
//do not call the eventfilter when the m_textEditor is gone
if (!TextEditor::TextEditorWidget::fromEditor(m_textEditor.get()))
return false;
static std::vector<int> overrideKeys = { Qt::Key_Delete, Qt::Key_Backspace, Qt::Key_Insert, static std::vector<int> overrideKeys = { Qt::Key_Delete, Qt::Key_Backspace, Qt::Key_Insert,
Qt::Key_Escape }; Qt::Key_Escape };