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

lib/utils/consoleprocess: Check for xdg-terminal

Browse Source 
Change-Id: I9970153d9abc9beff3081ddb09e7d3d95ea8c63a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Maximilian Goldstein
2020-01-15 14:39:20 +01:00
parent 5d53dbd501
commit 4d269f930a
2 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -64,10 +64,11 @@ namespace Utils {
// TerminalCommand
TerminalCommand::TerminalCommand(const QString &command, const QString &openArgs, const QString &executeArgs)
TerminalCommand::TerminalCommand(const QString &command, const QString &openArgs, const QString &executeArgs, bool needsQuotes)
: command(command)
, openArgs(openArgs)
, executeArgs(executeArgs)
, needsQuotes(needsQuotes)
{
}
@@ -143,6 +144,7 @@ void ConsoleProcess::setSettings(QSettings *settings)
Q_GLOBAL_STATIC_WITH_ARGS(const QVector<TerminalCommand>, knownTerminals, (
{
{"x-terminal-emulator", "", "-e"},
{"xdg-terminal", "", "", true},
{"xterm", "", "-e"},
{"aterm", "", "-e"},
{"Eterm", "", "-e"},
@@ -173,7 +175,7 @@ TerminalCommand ConsoleProcess::defaultTerminalEmulator()
for (const TerminalCommand &term : *knownTerminals) {
const QString result = env.searchInPath(term.command).toString();
if (!result.isEmpty()) {
defaultTerm = {result, term.openArgs, term.executeArgs};
defaultTerm = {result, term.openArgs, term.executeArgs, term.needsQuotes};
break;
}
}
@@ -562,16 +564,19 @@ bool ConsoleProcess::start()
const QString stubPath = QCoreApplication::applicationDirPath()
+ QLatin1String("/" QTC_REL_TOOLS_PATH "/qtcreator_process_stub");
const QStringList allArgs = terminalArgs.toUnixArgs()
<< stubPath
<< modeOption(d->m_mode)
<< d->m_stubServer.fullServerName()
<< msgPromptToClose()
<< workingDirectory()
<< (d->m_tempFile ? d->m_tempFile->fileName() : QString())
<< QString::number(getpid())
<< pcmd
<< pargs.toUnixArgs();
QStringList allArgs = terminalArgs.toUnixArgs()
<< stubPath
<< modeOption(d->m_mode)
<< d->m_stubServer.fullServerName()
<< msgPromptToClose()
<< workingDirectory()
<< (d->m_tempFile ? d->m_tempFile->fileName() : QString())
<< QString::number(getpid())
<< pcmd
<< pargs.toUnixArgs();
if (terminal.needsQuotes)
allArgs = QStringList { QtcProcess::joinArgs(allArgs) };
d->m_process.start(terminal.command, allArgs);
if (!d->m_process.waitForStarted()) {