Commit 9e20d6df authored by Oswald Buddenhagen's avatar Oswald Buddenhagen Committed by Joerg Bornemann

useCtrlCStub is windows-only. make #ifdefs reflect that consistently

Change-Id: I9504df9a2a0d6381c66ec71f40799d185461731a
Reviewed-on: http://codereview.qt.nokia.com/2917Reviewed-by: default avatarQt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: default avatarJoerg Bornemann <joerg.bornemann@nokia.com>
parent 72465c45
......@@ -49,14 +49,18 @@ class QTCREATOR_UTILS_EXPORT QtcProcess : public QProcess
public:
QtcProcess(QObject *parent = 0)
: QProcess(parent),
m_haveEnv(false),
m_useCtrlCStub(false)
m_haveEnv(false)
#ifdef Q_OS_WIN
, m_useCtrlCStub(false)
#endif
{}
void setEnvironment(const Environment &env)
{ m_environment = env; m_haveEnv = true; }
void setCommand(const QString &command, const QString &arguments)
{ m_command = command; m_arguments = arguments; }
#ifdef Q_OS_WIN
void setUseCtrlCStub(bool enabled) { m_useCtrlCStub = enabled; }
#endif
void start();
void terminate();
......@@ -148,7 +152,9 @@ private:
QString m_arguments;
Environment m_environment;
bool m_haveEnv;
#ifdef Q_OS_WIN
bool m_useCtrlCStub;
#endif
};
}
......
......@@ -189,7 +189,9 @@ void AbstractProcessStep::run(QFutureInterface<bool> &fi)
wd.mkpath(wd.absolutePath());
m_process = new Utils::QtcProcess();
#ifdef Q_OS_WIN
m_process->setUseCtrlCStub(true);
#endif
m_process->setWorkingDirectory(wd.absolutePath());
m_process->setEnvironment(m_param.environment());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment