Merge remote-tracking branch 'origin/7.0'

 Conflicts:
	src/libs/ssh/sshremoteprocessrunner.h

Change-Id: I4ce088c68704845ec8ec6feaad10bf747e415bec

3 files changed, 3 insertions, 3 deletions

diff --git a/src/plugins/perfprofiler/perfconfigwidget.cpp b/src/plugins/perfprofiler/perfconfigwidget.cpp
index d201a08ff0d..b58900c5d60 100644
--- a/src/plugins/perfprofiler/perfconfigwidget.cpp
+++ b/src/plugins/perfprofiler/perfconfigwidget.cpp
@@ -149,7 +149,7 @@ void PerfConfigWidget::setTarget(ProjectExplorer::Target *target)
     connect(m_process.get(), &ProjectExplorer::DeviceProcess::finished,
             this, &PerfConfigWidget::handleProcessFinished);
 
-    connect(m_process.get(), &ProjectExplorer::DeviceProcess::error,
+    connect(m_process.get(), &ProjectExplorer::DeviceProcess::errorOccurred,
             this, &PerfConfigWidget::handleProcessError);
 
     useTracePointsButton->setEnabled(true);
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) {
diff --git a/src/plugins/perfprofiler/perftracepointdialog.cpp b/src/plugins/perfprofiler/perftracepointdialog.cpp
index b439fd7cbe9..3bb2197ea58 100644
--- a/src/plugins/perfprofiler/perftracepointdialog.cpp
+++ b/src/plugins/perfprofiler/perftracepointdialog.cpp
@@ -113,7 +113,7 @@ void PerfTracePointDialog::runScript()
     connect(m_process.get(), &DeviceProcess::finished,
             this, &PerfTracePointDialog::handleProcessFinished);
 
-    connect(m_process.get(), &DeviceProcess::error,
+    connect(m_process.get(), &DeviceProcess::errorOccurred,
             this, &PerfTracePointDialog::handleProcessError);
 
     m_process->start(runnable);