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

Merge remote-tracking branch 'origin/9.0'

Browse Source 
Conflicts:
	src/plugins/cppeditor/cppelementevaluator.cpp
	src/plugins/vcsbase/vcsbaseclient.cpp

Change-Id: I31e03b063240416280f5ca88c31f432911d5c67e
This commit is contained in:
Eike Ziller
2022-12-12 11:07:15 +01:00
parent 172066ed56 2596f39823
commit af60fb8241
17 changed files with 207 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/texteditor/texteditor.cpp
View File

@@ -7850,7 +7850,7 @@ struct MappedText
void TextEditorWidget::insertFromMimeData(const QMimeData *source)
{
if (isReadOnly())
if (!source || isReadOnly())
return;
QString text = source->text();
@@ -7860,7 +7860,6 @@ void TextEditorWidget::insertFromMimeData(const QMimeData *source)
if (d->m_codeAssistant.hasContext())
d->m_codeAssistant.destroyContext();
if (d->m_snippetOverlay->isVisible() && (text.contains('\n') || text.contains('\t')))
d->m_snippetOverlay->accept();