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

4
src/plugins/coreplugin/find/findtoolbar.cpp
View File

@@ -962,9 +962,9 @@ void FindToolBar::setLightColoredIcon(bool lightColored)
m_ui.findPreviousButton->setArrowType(Qt::LeftArrow);
m_ui.close->setIcon(Icons::CLOSE_FOREGROUND.icon());
} else {
m_ui.findNextButton->setIcon(Icons::NEXT.icon());
m_ui.findNextButton->setIcon(Icons::NEXT_TOOLBAR.icon());
m_ui.findNextButton->setArrowType(Qt::NoArrow);
m_ui.findPreviousButton->setIcon(Icons::PREV.icon());
m_ui.findPreviousButton->setIcon(Icons::PREV_TOOLBAR.icon());
m_ui.findPreviousButton->setArrowType(Qt::NoArrow);
m_ui.close->setIcon(Icons::CLOSE_TOOLBAR.icon());
}