Merge remote-tracking branch 'origin/4.9'

Change-Id: If4e8f52fc94c4e5fd9ec69c9000436d4ded913ff

1 files changed, 7 insertions, 3 deletions

diff --git a/src/plugins/perfprofiler/perfdatareader.cpp b/src/plugins/perfprofiler/perfdatareader.cpp
index 3fec773bad..c137e87b8c 100644
--- a/src/plugins/perfprofiler/perfdatareader.cpp
+++ b/src/plugins/perfprofiler/perfdatareader.cpp
@@ -77,7 +77,8 @@ PerfDataReader::PerfDataReader(QObject *parent) :
             QMessageBox::warning(Core::ICore::mainWindow(),
                                  tr("Perf data parser failed"),
                                  tr("The perf data parser failed to process all the samples. "
-                                    "Your trace is incomplete."));
+                                    "Your trace is incomplete. The exit code was %1.")
+                                 .arg(exitCode));
         }
     });
 
@@ -120,6 +121,7 @@ PerfDataReader::PerfDataReader(QObject *parent) :
             qWarning() << "Cannot send data to perfparser";
             break;
         case QProcess::Timedout:
+            qWarning() << "QProcess::Timedout";
         default:
             break;
         }
@@ -349,8 +351,10 @@ void PerfDataReader::writeChunk()
                                         "Your trace is incomplete."));
             }
         }
-    } else if (m_dataFinished) {
-        m_input.closeWriteChannel();
+    } else if (m_dataFinished && m_input.isWritable()) {
+        // Delay closing of the write channel. Closing the channel from within a handler
+        // for bytesWritten() is dangerous on windows.
+        QTimer::singleShot(0, &m_input, &QProcess::closeWriteChannel);
     }
 }