From f003234510b924bf1c901843263fbbb69992f5e9 Mon Sep 17 00:00:00 2001 From: Marcus Tillmanns Date: Wed, 7 Jun 2023 12:29:29 +0200 Subject: [PATCH] Utils: Convert openTerminal.py to Terminal.app 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 --- src/libs/utils/terminalcommand.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/libs/utils/terminalcommand.cpp b/src/libs/utils/terminalcommand.cpp index 102fc42e05d..923b0cd4fe2 100644 --- a/src/libs/utils/terminalcommand.cpp +++ b/src/libs/utils/terminalcommand.cpp @@ -112,7 +112,12 @@ const char kTerminalExecuteOptionsKey[] = "General/Terminal/ExecuteOptions"; TerminalCommand TerminalCommand::terminalEmulator() { 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(kTerminalExecuteOptionsKey).toString()}; }