summaryrefslogtreecommitdiff
path: root/src/libs/utils/consoleprocess_unix.cpp
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@qt.io>2017-01-11 13:57:27 +0100
committerOswald Buddenhagen <oswald.buddenhagen@qt.io>2017-01-18 07:36:45 +0000
commitafddd1008d577f4361a8f13e0842a7254b040556 (patch)
tree3db8d8e7be91c35bbe895e0ce8cf34f12626ffb9 /src/libs/utils/consoleprocess_unix.cpp
parent16bdcca60fb6664f4cfc79ba13cd6d498c24ef2e (diff)
downloadqt-creator-afddd1008d577f4361a8f13e0842a7254b040556.tar.gz
windows: stub out terminal-related functions of ConsoleProcess more thoroughly
... as the concept really doesn't make any sense on windows. Change-Id: I5fa970d17e6f4c1724250b8ee8cf0fd4eafc10ca 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.cpp16
1 files changed, 16 insertions, 0 deletions
diff --git a/src/libs/utils/consoleprocess_unix.cpp b/src/libs/utils/consoleprocess_unix.cpp
index a4d0183d3e..53d20d5a5e 100644
--- a/src/libs/utils/consoleprocess_unix.cpp
+++ b/src/libs/utils/consoleprocess_unix.cpp
@@ -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();