Merge remote-tracking branch 'origin/4.0'

Conflicts:
	src/plugins/projectexplorer/session.cpp
	src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp

Change-Id: I6946139f5e5fa3a9cdbb322fd50be248e2c0133f

src/plugins/autotest/testoutputreader.h

@@ -48,6 +48,7 @@ public:
 
 protected:
     virtual void processOutput() = 0;
+    virtual void processStdError();
     QFutureInterface<TestResultPtr> m_futureInterface;
     QProcess *m_testApplication;  // not owned
     QString m_buildDir;