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

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

@@ -25,8 +25,6 @@
#include "consoleprocess_p.h" #include "consoleprocess_p.h"
#include <QSettings>
namespace Utils { namespace Utils {
ConsoleProcess::~ConsoleProcess() ConsoleProcess::~ConsoleProcess()
@@ -153,19 +151,4 @@ void ConsoleProcess::emitError(QProcess::ProcessError err, const QString &errorS
emit processError(errorString); 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);
}
} }

10
src/libs/utils/consoleprocess.h
View File

@@ -85,11 +85,21 @@ public:
static QString createWinCommandline(const QString &program, const QString &args); static QString createWinCommandline(const QString &program, const QString &args);
#endif #endif
#ifndef Q_OS_WIN
void setSettings(QSettings *settings); void setSettings(QSettings *settings);
static QString defaultTerminalEmulator(); static QString defaultTerminalEmulator();
static QStringList availableTerminalEmulators(); static QStringList availableTerminalEmulators();
static QString terminalEmulator(const QSettings *settings, bool nonEmpty = true); static QString terminalEmulator(const QSettings *settings, bool nonEmpty = true);
static void setTerminalEmulator(QSettings *settings, const QString &term); 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); static bool startTerminalEmulator(QSettings *settings, const QString &workingDir);

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

@@ -31,6 +31,7 @@
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <QCoreApplication> #include <QCoreApplication>
#include <QSettings>
#include <QTimer> #include <QTimer>
#include <sys/stat.h> #include <sys/stat.h>
@@ -395,6 +396,21 @@ QStringList ConsoleProcess::availableTerminalEmulators()
return result; 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) bool ConsoleProcess::startTerminalEmulator(QSettings *settings, const QString &workingDir)
{ {
const QString emu = QtcProcess::splitArgs(terminalEmulator(settings)).takeFirst(); const QString emu = QtcProcess::splitArgs(terminalEmulator(settings)).takeFirst();

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

@@ -373,22 +373,6 @@ QString ConsoleProcess::createWinCommandline(const QString &program, const QStri
return programName; 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) bool ConsoleProcess::startTerminalEmulator(QSettings *, const QString &workingDir)
{ {
STARTUPINFO si; STARTUPINFO si;