diff options
author | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-05-16 15:57:02 +0200 |
---|---|---|
committer | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-05-19 11:33:03 +0200 |
commit | 3d38541b14a7e8c3b0c080f3bd2dfa6100792bb7 (patch) | |
tree | 570ac77a0a17870851e43acd956b46156255c85b | |
parent | a64a49ffcbe8d9e6b2aa6e41c182444f6fe4b590 (diff) | |
download | qt-creator-3d38541b14a7e8c3b0c080f3bd2dfa6100792bb7.tar.gz |
disable Ctrl-C stub in debug build
Activating the controlcstub in a debug build will send Ctrl-C to
Qt Creator too, because he stub and Qt Creator share the same
Windows.
We're disabling the stub in debug builds. Cancelling a build
still works but takes a bit longer.
Task-number: QTCREATORBUG-11995
Change-Id: I766c2eac1f07205c411a7e4164e7d73b6c0441aa
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
-rw-r--r-- | src/libs/utils/qtcprocess.cpp | 10 | ||||
-rw-r--r-- | src/libs/utils/qtcprocess.h | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/src/libs/utils/qtcprocess.cpp b/src/libs/utils/qtcprocess.cpp index 5410e75aec..210a8d840c 100644 --- a/src/libs/utils/qtcprocess.cpp +++ b/src/libs/utils/qtcprocess.cpp @@ -671,6 +671,16 @@ bool QtcProcess::prepareCommand(const QString &command, const QString &arguments return true; } +void QtcProcess::setUseCtrlCStub(bool enabled) +{ + // Do not use the stub in debug mode. Activating the stub will shut down + // Qt Creator otherwise, because they share the same Windows console. + // See QTCREATORBUG-11995 for details. +#ifndef QT_DEBUG + m_useCtrlCStub = enabled; +#endif +} + void QtcProcess::start() { Environment env; diff --git a/src/libs/utils/qtcprocess.h b/src/libs/utils/qtcprocess.h index ca1dff19fc..9197464a09 100644 --- a/src/libs/utils/qtcprocess.h +++ b/src/libs/utils/qtcprocess.h @@ -51,7 +51,7 @@ public: { m_environment = env; m_haveEnv = true; } void setCommand(const QString &command, const QString &arguments) { m_command = command; m_arguments = arguments; } - void setUseCtrlCStub(bool enabled) { m_useCtrlCStub = enabled; } + void setUseCtrlCStub(bool enabled); void start(); void terminate(); void interrupt(); |