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

Merge remote-tracking branch 'origin/12.0'

Browse Source 
Change-Id: I04104ef638b28d99da11b9b7a22f31f8d0ddf460
This commit is contained in:
Eike Ziller
2023-10-24 13:05:55 +02:00
parent 03acf2810d 5e3d14e2e9
commit df80454d26
277 changed files with 2282 additions and 2346 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/terminal/terminalwidget.cpp
View File

@@ -85,7 +85,7 @@ void TerminalWidget::setupPty()
CommandLine{settings().shell(), settings().shellArguments(), CommandLine::Raw});
if (shellCommand.executable().isRootPath()) {
writeToTerminal(Tr::tr("Connecting ...\r\n").toUtf8(), true);
writeToTerminal((Tr::tr("Connecting...") + "\r\n").toUtf8(), true);
// We still have to find the shell to start ...
m_findShellWatcher.reset(new QFutureWatcher<expected_str<FilePath>>());
connect(m_findShellWatcher.get(), &QFutureWatcher<FilePath>::finished, this, [this] {
@@ -107,7 +107,7 @@ void TerminalWidget::setupPty()
shellCommand.executable());
if (result && !result->isExecutableFile())
return make_unexpected(
Tr::tr("'%1' is not executable.").arg(result->toUserOutput()));
Tr::tr("\"%1\" is not executable.").arg(result->toUserOutput()));
return result;
}));