diff options
| author | Eike Ziller <[email protected]> | 2022-01-28 14:59:08 +0100 |
|---|---|---|
| committer | Eike Ziller <[email protected]> | 2022-01-28 14:59:08 +0100 |
| commit | 116b498b342b3c2194bd864417c360808495fb13 (patch) | |
| tree | a4075534cc6e9d072b96e8178905ade33f4de425 /src/plugins/perfprofiler/perfprofilerruncontrol.cpp | |
| parent | 95a9b22f6fe07f8417ad94722d456d4a5730f068 (diff) | |
| parent | 0923d8676eb6ce7e1af5fc54c83f399eb0ec6648 (diff) | |
Merge remote-tracking branch 'origin/7.0'
Conflicts:
src/libs/ssh/sshremoteprocessrunner.h
Change-Id: I4ce088c68704845ec8ec6feaad10bf747e415bec
Diffstat (limited to 'src/plugins/perfprofiler/perfprofilerruncontrol.cpp')
| -rw-r--r-- | src/plugins/perfprofiler/perfprofilerruncontrol.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/perfprofiler/perfprofilerruncontrol.cpp b/src/plugins/perfprofiler/perfprofilerruncontrol.cpp index 4bdecd52dbb..684918bb6a8 100644 --- a/src/plugins/perfprofiler/perfprofilerruncontrol.cpp +++ b/src/plugins/perfprofiler/perfprofilerruncontrol.cpp @@ -133,7 +133,7 @@ public: connect(m_process, &DeviceProcess::started, this, &RunWorker::reportStarted); connect(m_process, &DeviceProcess::finished, this, &RunWorker::reportStopped); - connect(m_process, &DeviceProcess::error, [this](QProcess::ProcessError e) { + connect(m_process, &DeviceProcess::errorOccurred, [this](QProcess::ProcessError e) { // The terminate() below will frequently lead to QProcess::Crashed. We're not interested // in that. FailedToStart is the only actual failure. if (e == QProcess::FailedToStart) { |