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

Merge remote-tracking branch 'origin/8.0'

Browse Source 
Conflicts:
	.github/workflows/build_cmake.yml
	src/plugins/qmldesigner/components/connectioneditor/dynamicpropertiesmodel.cpp
	src/plugins/qmldesigner/components/materialeditor/materialeditorview.h
	src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp
	src/plugins/qmldesigner/designercore/model/model.cpp

Change-Id: I111b9140375b894a5487cc012b17cc32100bdb8d
This commit is contained in:
Eike Ziller
2022-09-13 11:15:16 +02:00
parent fbd4775f89 67408ac183
commit 5ae23f8c66
73 changed files with 2547 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7851,7 +7851,7 @@ void TextEditorWidget::dropEvent(QDropEvent *e)
MultiTextCursor cursor = multiTextCursor();
cursor.beginEditBlock();
const QTextCursor eventCursor = cursorForPosition(e->pos());
if (e->dropAction() == Qt::MoveAction)
if (e->dropAction() == Qt::MoveAction && e->source() == viewport())
cursor.removeSelectedText();
cursor.setCursors({eventCursor});
setMultiTextCursor(cursor);
@@ -7864,6 +7864,7 @@ void TextEditorWidget::dropEvent(QDropEvent *e)
insertFromMimeData(mime);
delete mimeOverwrite;
cursor.endEditBlock();
e->acceptProposedAction();
}
QMimeData *TextEditorWidget::duplicateMimeData(const QMimeData *source)