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/debugger/watchdata.cpp
	src/plugins/debugger/watchdata.h
	src/shared/qbs

Change-Id: I19b338b316d9c4c046074eb85b3fec79e86e6c32
This commit is contained in:
Eike Ziller
2016-06-09 12:07:01 +02:00
parent ae7e03d51f cda5f70cd9
commit 1681066c37
10 changed files with 147 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qbsprojectmanager/qbslogsink.cpp
View File

@@ -60,7 +60,7 @@ void QbsLogSink::sendMessages()
}
foreach (const QString &msg, toSend)
Core::MessageManager::write(msg);
Core::MessageManager::write(msg, Core::MessageManager::Silent);
}
void QbsLogSink::doPrintWarning(const qbs::ErrorInfo &warning)