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

Utils: Convert openTerminal.py to Terminal.app

Browse Source 
Qt Creator 10.0 may have saved "openTerminal.py" in its settings.
We don't used that anymore, so we convert it to Terminal.app.

Fixes: QTCREATORBUG-29246
Change-Id: Ifc67e6e7bbc7af5dfaf6703b3bd34ded847c5013
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Marcus Tillmanns
2023-06-07 12:29:29 +02:00
parent b2364923e6
commit f003234510
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/libs/utils/terminalcommand.cpp
View File

@@ -112,7 +112,12 @@ const char kTerminalExecuteOptionsKey[] = "General/Terminal/ExecuteOptions";
TerminalCommand TerminalCommand::terminalEmulator() TerminalCommand TerminalCommand::terminalEmulator()
{ {
if (s_settings && HostOsInfo::isAnyUnixHost() && s_settings->contains(kTerminalCommandKey)) { if (s_settings && HostOsInfo::isAnyUnixHost() && s_settings->contains(kTerminalCommandKey)) {
return {FilePath::fromSettings(s_settings->value(kTerminalCommandKey)), FilePath command = FilePath::fromSettings(s_settings->value(kTerminalCommandKey));
if (HostOsInfo::isMacHost() && command.endsWith("openTerminal.py"))
command = FilePath::fromString("Terminal.app");
return {command,
s_settings->value(kTerminalOpenOptionsKey).toString(), s_settings->value(kTerminalOpenOptionsKey).toString(),
s_settings->value(kTerminalExecuteOptionsKey).toString()}; s_settings->value(kTerminalExecuteOptionsKey).toString()};
} }