diff --git a/src/libs/utils/consoleprocess.cpp b/src/libs/utils/consoleprocess.cpp index b19c29e8bc6..077cbc19d6f 100644 --- a/src/libs/utils/consoleprocess.cpp +++ b/src/libs/utils/consoleprocess.cpp @@ -25,8 +25,6 @@ #include "consoleprocess_p.h" -#include - namespace Utils { ConsoleProcess::~ConsoleProcess() @@ -153,19 +151,4 @@ void ConsoleProcess::emitError(QProcess::ProcessError err, const QString &errorS emit processError(errorString); } -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); -} - } diff --git a/src/libs/utils/consoleprocess.h b/src/libs/utils/consoleprocess.h index 6f081172583..7fc84bc36d6 100644 --- a/src/libs/utils/consoleprocess.h +++ b/src/libs/utils/consoleprocess.h @@ -85,11 +85,21 @@ public: static QString createWinCommandline(const QString &program, const QString &args); #endif +#ifndef Q_OS_WIN void setSettings(QSettings *settings); + static QString defaultTerminalEmulator(); static QStringList availableTerminalEmulators(); static QString terminalEmulator(const QSettings *settings, bool nonEmpty = true); static void setTerminalEmulator(QSettings *settings, const QString &term); +#else + void setSettings(QSettings *) {} + + static QString defaultTerminalEmulator() { return QString(); } + static QStringList availableTerminalEmulators() { return QStringList(); } + static QString terminalEmulator(const QSettings *, bool = true) { return QString(); } + static void setTerminalEmulator(QSettings *, const QString &) {} +#endif static bool startTerminalEmulator(QSettings *settings, const QString &workingDir); diff --git a/src/libs/utils/consoleprocess_unix.cpp b/src/libs/utils/consoleprocess_unix.cpp index a4d0183d3e7..53d20d5a5e2 100644 --- a/src/libs/utils/consoleprocess_unix.cpp +++ b/src/libs/utils/consoleprocess_unix.cpp @@ -31,6 +31,7 @@ #include #include +#include #include #include @@ -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(); diff --git a/src/libs/utils/consoleprocess_win.cpp b/src/libs/utils/consoleprocess_win.cpp index dfdbbfdb71b..f12d31e8afb 100644 --- a/src/libs/utils/consoleprocess_win.cpp +++ b/src/libs/utils/consoleprocess_win.cpp @@ -373,22 +373,6 @@ QString ConsoleProcess::createWinCommandline(const QString &program, const QStri return programName; } -QString ConsoleProcess::defaultTerminalEmulator() -{ - return QString::fromLocal8Bit(qgetenv("COMSPEC")); -} - -QStringList ConsoleProcess::availableTerminalEmulators() -{ - return QStringList(ConsoleProcess::defaultTerminalEmulator()); -} - -void ConsoleProcess::setSettings(QSettings *settings) -{ - Q_UNUSED(settings) - // Not used on Windows -} - bool ConsoleProcess::startTerminalEmulator(QSettings *, const QString &workingDir) { STARTUPINFO si;