feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Utils: Remove Debug restriction for useCtrlCStub

Browse Source 
process_ctrlc_stub doesn't generate a Ctrl+C event sent via
GenerateConsoleCtrlEvent for the child process to terminate.

So the Debug restriction to workaround QTCREATORBUG-11995 is
no longer needed.

Change-Id: Iafc8b51bce17432c80b0be0c4084978abc1c909f
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Cristian Adam
2022-05-11 13:25:37 +02:00
parent d1ff9b8ffb
commit 8be05ca745
4 changed files with 2 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/utils/processinterface.h
View File

@@ -58,7 +58,7 @@ public:
bool m_runAsRoot = false; bool m_runAsRoot = false;
bool m_lowPriority = false; bool m_lowPriority = false;
bool m_unixTerminalDisabled = false; bool m_unixTerminalDisabled = false;
bool m_useCtrlCStub = false; // release only bool m_useCtrlCStub = false;
bool m_belowNormalPriority = false; // internal, dependent on other fields and specific code path bool m_belowNormalPriority = false; // internal, dependent on other fields and specific code path
}; };

7
src/libs/utils/processutils.cpp
View File

@@ -112,14 +112,7 @@ BOOL CALLBACK sendInterruptMessageToAllWindowsOfProcess_enumWnd(HWND hwnd, LPARA
void ProcessHelper::setUseCtrlCStub(bool enabled) void ProcessHelper::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.
#ifdef QT_DEBUG
Q_UNUSED(enabled)
#else
m_useCtrlCStub = enabled; m_useCtrlCStub = enabled;
#endif
} }
void ProcessHelper::terminateProcess() void ProcessHelper::terminateProcess()

2
src/libs/utils/processutils.h
View File

@@ -85,7 +85,7 @@ private:
bool m_lowPriority = false; bool m_lowPriority = false;
bool m_unixTerminalDisabled = false; bool m_unixTerminalDisabled = false;
bool m_useCtrlCStub = false; // release only bool m_useCtrlCStub = false;
ProcessStartHandler m_processStartHandler; ProcessStartHandler m_processStartHandler;
}; };

7
src/libs/utils/qtcprocess.cpp
View File

@@ -1059,14 +1059,7 @@ void QtcProcess::setWorkingDirectory(const FilePath &dir)
void QtcProcess::setUseCtrlCStub(bool enabled) 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.
#ifdef QT_DEBUG
Q_UNUSED(enabled)
#else
d->m_setup.m_useCtrlCStub = enabled; d->m_setup.m_useCtrlCStub = enabled;
#endif
} }
void QtcProcess::start() void QtcProcess::start()