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

windows: stub out terminal-related functions of ConsoleProcess more thoroughly

Browse Source 
... as the concept really doesn't make any sense on windows.

Change-Id: I5fa970d17e6f4c1724250b8ee8cf0fd4eafc10ca
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Oswald Buddenhagen
2017-01-11 13:57:27 +01:00
parent 16bdcca60f
commit afddd1008d
4 changed files with 26 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/libs/utils/consoleprocess_unix.cpp
View File

@@ -31,6 +31,7 @@
#include <utils/qtcassert.h>
#include <QCoreApplication>
#include <QSettings>
#include <QTimer>
#include <sys/stat.h>
@@ -395,6 +396,21 @@ QStringList ConsoleProcess::availableTerminalEmulators()
return result;
}
QString ConsoleProcess::terminalEmulator(const QSettings *settings, bool nonEmpty)
{
if (settings) {
const QString value = settings->value(QLatin1String("General/TerminalEmulator")).toString();
if (!nonEmpty || !value.isEmpty())
return value;
}
return defaultTerminalEmulator();
}
void ConsoleProcess::setTerminalEmulator(QSettings *settings, const QString &term)
{
return settings->setValue(QLatin1String("General/TerminalEmulator"), term);
}
bool ConsoleProcess::startTerminalEmulator(QSettings *settings, const QString &workingDir)
{
const QString emu = QtcProcess::splitArgs(terminalEmulator(settings)).takeFirst();