From a1588918b3a5939cbbd584e4354444c20fc4fbc1 Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 14 Jul 2022 15:51:24 +0200 Subject: [PATCH] Utils: Adapt ProcessHelper to move to Qt 6.2 And move constructor out-of-line. Change-Id: Iab92dbef56d60f2ec2d19b778fd968834dd72766 Reviewed-by: Jarek Kobus --- src/libs/utils/processutils.cpp | 8 ++++++++ src/libs/utils/processutils.h | 14 +++----------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/libs/utils/processutils.cpp b/src/libs/utils/processutils.cpp index 3019bcd2c82..cd0686b2721 100644 --- a/src/libs/utils/processutils.cpp +++ b/src/libs/utils/processutils.cpp @@ -110,6 +110,14 @@ BOOL CALLBACK sendInterruptMessageToAllWindowsOfProcess_enumWnd(HWND hwnd, LPARA } #endif +ProcessHelper::ProcessHelper(QObject *parent) + : QProcess(parent), m_processStartHandler(this) +{ +#if defined(Q_OS_UNIX) + setChildProcessModifier([this] { setupChildProcess_impl(); }); +#endif +} + void ProcessHelper::setUseCtrlCStub(bool enabled) { m_useCtrlCStub = enabled; diff --git a/src/libs/utils/processutils.h b/src/libs/utils/processutils.h index 141de2d4fde..5893e0ed749 100644 --- a/src/libs/utils/processutils.h +++ b/src/libs/utils/processutils.h @@ -32,7 +32,8 @@ namespace Utils { -class ProcessStartHandler { +class ProcessStartHandler +{ public: ProcessStartHandler(QProcess *process) : m_process(process) {} @@ -55,16 +56,7 @@ class ProcessHelper : public QProcess Q_OBJECT public: - ProcessHelper(QObject *parent) : QProcess(parent), m_processStartHandler(this) - { -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) && defined(Q_OS_UNIX) - setChildProcessModifier([this] { setupChildProcess_impl(); }); -#endif - } - -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) - void setupChildProcess() override { setupChildProcess_impl(); } -#endif + explicit ProcessHelper(QObject *parent); ProcessStartHandler *processStartHandler() { return &m_processStartHandler; }