forked from qt-creator/qt-creator
unify application launcher between platforms
purge abstractprocess and winguiprocess. they serve no purpose. applications can have stdio on windows as well, in addition to the windows debug channel. Task-number: QTCREATORBUG-4822
This commit is contained in:
@@ -33,7 +33,9 @@
|
||||
#ifndef CONSOLEPROCESS_H
|
||||
#define CONSOLEPROCESS_H
|
||||
|
||||
#include "abstractprocess.h"
|
||||
#include "utils_global.h"
|
||||
|
||||
#include "environment.h"
|
||||
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QString>
|
||||
@@ -48,7 +50,7 @@ QT_END_NAMESPACE
|
||||
namespace Utils {
|
||||
struct ConsoleProcessPrivate;
|
||||
|
||||
class QTCREATOR_UTILS_EXPORT ConsoleProcess : public QObject, public AbstractProcess
|
||||
class QTCREATOR_UTILS_EXPORT ConsoleProcess : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
@@ -57,6 +59,12 @@ public:
|
||||
ConsoleProcess(QObject *parent = 0);
|
||||
~ConsoleProcess();
|
||||
|
||||
void setWorkingDirectory(const QString &dir);
|
||||
QString workingDirectory() const;
|
||||
|
||||
void setEnvironment(const Environment &env);
|
||||
Environment environment() const;
|
||||
|
||||
bool start(const QString &program, const QString &args);
|
||||
void stop();
|
||||
|
||||
@@ -73,7 +81,13 @@ public:
|
||||
int exitCode() const;
|
||||
QProcess::ExitStatus exitStatus() const;
|
||||
|
||||
#ifdef Q_OS_UNIX
|
||||
#ifdef Q_OS_WIN
|
||||
// Add PATH and SystemRoot environment variables in case they are missing
|
||||
static QStringList fixWinEnvironment(const QStringList &env);
|
||||
// Quote a Windows command line correctly for the "CreateProcess" API
|
||||
static QString createWinCommandline(const QString &program, const QStringList &args);
|
||||
static QString createWinCommandline(const QString &program, const QString &args);
|
||||
#else
|
||||
void setSettings(QSettings *settings);
|
||||
static QString defaultTerminalEmulator();
|
||||
static QString terminalEmulator(const QSettings *settings);
|
||||
|
||||
Reference in New Issue
Block a user