Merge remote-tracking branch 'origin/4.13' into master

 Conflicts:
	src/plugins/qmakeprojectmanager/qmakeproject.cpp

Change-Id: Ieb1c3e946f11d3c4fa1ee6b5afdf83cc532d8aed

2 files changed, 10 insertions, 11 deletions

diff --git a/src/plugins/autotest/boost/boosttestoutputreader.cpp b/src/plugins/autotest/boost/boosttestoutputreader.cpp
index 2fe0a1c9283..84cd3e45a08 100644
--- a/src/plugins/autotest/boost/boosttestoutputreader.cpp
+++ b/src/plugins/autotest/boost/boosttestoutputreader.cpp
@@ -206,8 +206,6 @@ void BoostTestOutputReader::processOutputLine(const QByteArray &outputLine)
 
     static QRegularExpression finish("^\\*{3} (\\d+) failure(s are| is) detected in the "
                                      "test module \"(.*)\"$");
-    static QRegularExpression errDetect("^\\*{3} Errors where detected in the "
-                                        "test module \"(.*}\"; see standard output for details");
     QString noErrors("*** No errors detected");
 
     const QString line = removeCommandlineColors(QString::fromUtf8(outputLine));
@@ -340,8 +338,7 @@ void BoostTestOutputReader::processOutputLine(const QByteArray &outputLine)
         BoostTestResult *result = new BoostTestResult(id(), m_projectFile, QString());
         int failed = match.captured(1).toInt();
         QString txt = tr("%1 failures detected in %2.").arg(failed).arg(match.captured(3));
-        int passed = (m_testCaseCount != -1)
-                ? m_testCaseCount - failed - m_summary[ResultType::Skip] : -1;
+        int passed = (m_testCaseCount != -1) ? m_testCaseCount - failed : -1;
         if (m_testCaseCount != -1)
             txt.append(' ').append(tr("%1 tests passed.").arg(passed));
         result->setDescription(txt);
diff --git a/src/plugins/autotest/testrunner.cpp b/src/plugins/autotest/testrunner.cpp
index 4581b91bd53..37fc75f464f 100644
--- a/src/plugins/autotest/testrunner.cpp
+++ b/src/plugins/autotest/testrunner.cpp
@@ -268,7 +268,7 @@ void TestRunner::cancelCurrent(TestRunner::CancelReason reason)
 
 void TestRunner::onProcessFinished()
 {
-    if (m_executingTests && QTC_GUARD(m_currentConfig)) {
+    if (m_executingTests && m_currentConfig) {
         QTC_CHECK(m_fakeFutureInterface);
         m_fakeFutureInterface->setProgressValue(m_fakeFutureInterface->progressValue()
                                                 + m_currentConfig->testCaseCount());
@@ -286,13 +286,15 @@ void TestRunner::onProcessFinished()
             }
         }
     }
-    const int disabled = m_currentOutputReader->disabledTests();
-    if (disabled > 0)
-        emit hadDisabledTests(disabled);
-    if (m_currentOutputReader->hasSummary())
-        emit reportSummary(m_currentOutputReader->id(), m_currentOutputReader->summary());
+    if (m_currentOutputReader) {
+        const int disabled = m_currentOutputReader->disabledTests();
+        if (disabled > 0)
+            emit hadDisabledTests(disabled);
+        if (m_currentOutputReader->hasSummary())
+            emit reportSummary(m_currentOutputReader->id(), m_currentOutputReader->summary());
 
-    m_currentOutputReader->resetCommandlineColor();
+        m_currentOutputReader->resetCommandlineColor();
+    }
     resetInternalPointers();
 
     if (!m_fakeFutureInterface) {