diff options
author | Eike Ziller <eike.ziller@qt.io> | 2018-09-05 16:36:57 +0200 |
---|---|---|
committer | Eike Ziller <eike.ziller@qt.io> | 2018-09-06 08:11:30 +0000 |
commit | 019092d7f6aed048302a99a72d5c00bb1f127a1d (patch) | |
tree | d4462d90a4955f6155c3059348a59a8f03472a23 /src/libs/utils/consoleprocess_unix.cpp | |
parent | c16c477333bf4bf6958c87f9fda36dd17c3bd8f4 (diff) | |
download | qt-creator-019092d7f6aed048302a99a72d5c00bb1f127a1d.tar.gz |
Fix terminal command on macOS
After 4c88c1808cddc2f134203e62b276f2f413e455c6 the terminal command
itself may no longer have quoted spaces (since it is directly passed to
QProcess as the program name).
Change-Id: Iee4b9a6c3a87c29cb29cc732f6027f1c742f9eb5
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'src/libs/utils/consoleprocess_unix.cpp')
-rw-r--r-- | src/libs/utils/consoleprocess_unix.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/libs/utils/consoleprocess_unix.cpp b/src/libs/utils/consoleprocess_unix.cpp index fd426a5f0c..ffaf34d5e8 100644 --- a/src/libs/utils/consoleprocess_unix.cpp +++ b/src/libs/utils/consoleprocess_unix.cpp @@ -350,9 +350,10 @@ TerminalCommand ConsoleProcess::defaultTerminalEmulator() if (defaultTerm.command.isEmpty()) { defaultTerm = []() -> TerminalCommand { if (HostOsInfo::isMacHost()) { - QString termCmd = QCoreApplication::applicationDirPath() + "/../Resources/scripts/openTerminal.command"; + const QString termCmd = QCoreApplication::applicationDirPath() + + "/../Resources/scripts/openTerminal.command"; if (QFileInfo::exists(termCmd)) - return {termCmd.replace(' ', "\\ "), "", ""}; + return {termCmd, "", ""}; return {"/usr/X11/bin/xterm", "", "-e"}; } const Environment env = Environment::systemEnvironment(); |