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

Utils: Fix determining default terminal

Browse Source 
Change-Id: Id39ef638a184a7cc593e1e6127f87814b9ca6381
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Eike Ziller
2019-09-03 11:30:51 +02:00
committed by Christian Stenger
parent 27b24218f6
commit 2926114b92
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/libs/utils/consoleprocess.cpp
View File

@@ -167,14 +167,15 @@ TerminalCommand ConsoleProcess::defaultTerminalEmulator()
else else
defaultTerm = {"/usr/X11/bin/xterm", "", "-e"}; defaultTerm = {"/usr/X11/bin/xterm", "", "-e"};
} else if (HostOsInfo::isAnyUnixHost()) { } else if (HostOsInfo::isAnyUnixHost()) {
defaultTerm = {"xterm", "", "-e"};
const Environment env = Environment::systemEnvironment(); const Environment env = Environment::systemEnvironment();
for (const TerminalCommand &term : *knownTerminals) { for (const TerminalCommand &term : *knownTerminals) {
const QString result = env.searchInPath(term.command).toString(); const QString result = env.searchInPath(term.command).toString();
if (!result.isEmpty()) if (!result.isEmpty()) {
defaultTerm = {result, term.openArgs, term.executeArgs}; defaultTerm = {result, term.openArgs, term.executeArgs};
else break;
defaultTerm = {"xterm", "", "-e"}; }
} }
} }
} }