feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/4.0'

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

Change-Id: I6946139f5e5fa3a9cdbb322fd50be248e2c0133f
This commit is contained in:
Eike Ziller
2016-04-20 14:58:48 +02:00
parent 0eeee15a88 5dc690f234
commit ee8bf341c6
112 changed files with 794 additions and 881 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libs/clangbackendipc/connectionclient.cpp
View File

@@ -233,12 +233,12 @@ void ConnectionClient::printLocalSocketError(QLocalSocket::LocalSocketError sock
void ConnectionClient::printStandardOutput()
{
QTextStream(stdout) << stdOutPrefixer.prefix(process_->readAllStandardOutput());
qDebug("%s", stdOutPrefixer.prefix(process_->readAllStandardOutput()).constData());
}
void ConnectionClient::printStandardError()
{
QTextStream(stderr) << stdErrPrefixer.prefix(process_->readAllStandardError());
qDebug("%s", stdErrPrefixer.prefix(process_->readAllStandardError()).constData());
}
void ConnectionClient::finishProcess()