Merge remote-tracking branch 'origin/4.12'

Change-Id: Ie35e9959693b6f6f78509eea5b259d6493ef87f2
2020-04-17 08:09:55 +02:00
parent 2795292c74 e85c074621
commit 602d690bab
55 changed files with 7620 additions and 5291 deletions
--- a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp
+++ b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp
@@ -537,6 +537,15 @@ QbsBuildStepData QbsBuildStep::stepData() const
    return data;
 }

+void QbsBuildStep::dropSession()
+{
+    if (m_session) {
+        doCancel();
+        m_session->disconnect(this);
+        m_session = nullptr;
+    }
+}
+

 // --------------------------------------------------------------------
 // QbsBuildStepConfigWidget: