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:
	qtcreator.pri
	qtcreator.qbs

Change-Id: I0cbc9d335073e3234f472aa43f462eef9a9178aa
This commit is contained in:
Eike Ziller
2016-04-22 15:13:58 +02:00
parent 582c46d34f 427bb8c363
commit 4a826ada04
83 changed files with 417 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/projectexplorer/appoutputpane.cpp
View File

@@ -157,7 +157,7 @@ AppOutputPane::AppOutputPane() :
setObjectName(QLatin1String("AppOutputPane")); // Used in valgrind engine
// Rerun
m_reRunButton->setIcon(Core::Icons::RUN_SMALL.icon());
m_reRunButton->setIcon(Core::Icons::RUN_SMALL_TOOLBAR.icon());
m_reRunButton->setToolTip(tr("Re-run this run-configuration"));
m_reRunButton->setAutoRaise(true);
m_reRunButton->setEnabled(false);
@@ -165,7 +165,7 @@ AppOutputPane::AppOutputPane() :
this, &AppOutputPane::reRunRunControl);
// Stop
m_stopAction->setIcon(Core::Icons::STOP_SMALL.icon());
m_stopAction->setIcon(Core::Icons::STOP_SMALL_TOOLBAR.icon());
m_stopAction->setToolTip(tr("Stop"));
m_stopAction->setEnabled(false);
@@ -643,7 +643,7 @@ void AppOutputPane::enableButtons(const RunControl *rc, bool isRunning)
m_zoomOutButton->setEnabled(true);
} else {
m_reRunButton->setEnabled(false);
m_reRunButton->setIcon(Core::Icons::RUN_SMALL.icon());
m_reRunButton->setIcon(Core::Icons::RUN_SMALL_TOOLBAR.icon());
m_attachButton->setEnabled(false);
m_attachButton->setToolTip(msgAttachDebuggerTooltip());
m_stopAction->setEnabled(false);