Merge remote-tracking branch 'origin/4.2'

Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri
	src/plugins/projectexplorer/kitinformation.cpp

Change-Id: I94299b069418586db97d1d596a252794e4037556
This commit is contained in:
Eike Ziller
2016-12-20 17:14:19 +01:00
61 changed files with 1032 additions and 1621 deletions

View File

@@ -544,6 +544,8 @@ void TestResultsPane::onCustomContextMenuRequested(const QPoint &pos)
void TestResultsPane::onCopyItemTriggered(const QModelIndex &idx)
{
if (!idx.isValid())
return;
const TestResult *result = m_filterModel->testResult(idx);
QTC_ASSERT(result, return);
QApplication::clipboard()->setText(result->outputString(true));