Merge remote-tracking branch 'origin/4.0'

Change-Id: If0ba896a083392a532f76bb26bec3540a7c17667
This commit is contained in:
Eike Ziller
2016-04-25 13:27:09 +02:00
60 changed files with 451 additions and 75 deletions

View File

@@ -180,7 +180,7 @@ AppOutputPane::AppOutputPane() :
// Attach
m_attachButton->setToolTip(msgAttachDebuggerTooltip());
m_attachButton->setEnabled(false);
m_attachButton->setIcon(Icons::DEBUG_START_SMALL.icon());
m_attachButton->setIcon(Icons::DEBUG_START_SMALL_TOOLBAR.icon());
m_attachButton->setAutoRaise(true);
connect(m_attachButton, &QAbstractButton::clicked,