diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-09-03 11:30:51 +0200 |
|---|---|---|
| committer | Christian Stenger <christian.stenger@qt.io> | 2019-09-03 10:59:01 +0000 |
| commit | 2926114b9212a83bd06ebb77dc48ae89697448c2 (patch) | |
| tree | b313ecb94b8f0ff0f13629159aa5b0b7c70ef15d /src/libs/utils/consoleprocess.cpp | |
| parent | 27b24218f612d23fd1665ec2742076161abf0554 (diff) | |
| download | qt-creator-2926114b9212a83bd06ebb77dc48ae89697448c2.tar.gz | |
Utils: Fix determining default terminal
Change-Id: Id39ef638a184a7cc593e1e6127f87814b9ca6381
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/libs/utils/consoleprocess.cpp')
| -rw-r--r-- | src/libs/utils/consoleprocess.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/libs/utils/consoleprocess.cpp b/src/libs/utils/consoleprocess.cpp index 80ba4aa57a..1e51550def 100644 --- a/src/libs/utils/consoleprocess.cpp +++ b/src/libs/utils/consoleprocess.cpp @@ -167,14 +167,15 @@ TerminalCommand ConsoleProcess::defaultTerminalEmulator() else defaultTerm = {"/usr/X11/bin/xterm", "", "-e"}; - } else if (HostOsInfo::isAnyUnixHost()) { + } else if (HostOsInfo::isAnyUnixHost()) { + defaultTerm = {"xterm", "", "-e"}; const Environment env = Environment::systemEnvironment(); for (const TerminalCommand &term : *knownTerminals) { const QString result = env.searchInPath(term.command).toString(); - if (!result.isEmpty()) + if (!result.isEmpty()) { defaultTerm = {result, term.openArgs, term.executeArgs}; - else - defaultTerm = {"xterm", "", "-e"}; + break; + } } } } |
