Merge remote-tracking branch 'origin/11.0'

Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	src/plugins/debugger/debuggerruncontrol.cpp

Change-Id: I7818dc765c2a137d6690a9a53b8ddda72b79ba2f
This commit is contained in:
Eike Ziller
2023-07-25 13:20:21 +02:00
3 changed files with 71 additions and 59 deletions

View File

@@ -420,8 +420,14 @@ void TerminalSurface::pasteFromClipboard(const QString &clipboardText)
return;
vterm_keyboard_start_paste(d->m_vterm.get());
for (unsigned int ch : clipboardText.toUcs4())
for (unsigned int ch : clipboardText.toUcs4()) {
// Workaround for weird nano behavior to correctly paste newlines
// see: http://savannah.gnu.org/bugs/?49176
// and: https://github.com/kovidgoyal/kitty/issues/994
if (ch == '\n')
ch = '\r';
vterm_keyboard_unichar(d->m_vterm.get(), ch, VTERM_MOD_NONE);
}
vterm_keyboard_end_paste(d->m_vterm.get());
if (!d->m_altscreen) {