feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/4.6'

Browse Source 
Change-Id: I421af2d62994436782dab6d37e97622bd055ed44
This commit is contained in:
Eike Ziller
2018-03-05 09:28:34 +01:00
parent d162085377 994a68280e
commit 124e4499eb
15 changed files with 82 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/diffeditor/diffeditor.cpp
View File

@@ -276,7 +276,7 @@ DiffEditor::DiffEditor()
m_reloadAction = m_toolBar->addAction(Utils::Icons::RELOAD.icon(), tr("Reload Diff"));
m_reloadAction->setToolTip(tr("Reload Diff"));
m_toggleSyncAction = m_toolBar->addAction(Utils::Icons::LINK.icon(), QString());
m_toggleSyncAction = m_toolBar->addAction(Utils::Icons::LINK_TOOLBAR.icon(), QString());
m_toggleSyncAction->setCheckable(true);
m_viewSwitcherAction = m_toolBar->addAction(QIcon(), QString());