diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2016-04-22 15:13:58 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2016-04-22 15:13:58 +0200 |
| commit | 4a826ada0486dd2c07b3932c6e62ad375f0edfbb (patch) | |
| tree | 39360b652210c9d92506fe0c0170f8e45a91b159 /src/plugins/help/helpwidget.cpp | |
| parent | 582c46d34f28f9e04af4d8179f455a603ded5ec7 (diff) | |
| parent | 427bb8c363fc3ee0d9c12ca7ac01d47dc0f6f8f4 (diff) | |
Merge remote-tracking branch 'origin/4.0'
Conflicts:
qtcreator.pri
qtcreator.qbs
Change-Id: I0cbc9d335073e3234f472aa43f462eef9a9178aa
Diffstat (limited to 'src/plugins/help/helpwidget.cpp')
| -rw-r--r-- | src/plugins/help/helpwidget.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/help/helpwidget.cpp b/src/plugins/help/helpwidget.cpp index 0a374514cbb..36abfd38e53 100644 --- a/src/plugins/help/helpwidget.cpp +++ b/src/plugins/help/helpwidget.cpp @@ -128,7 +128,7 @@ HelpWidget::HelpWidget(const Core::Context &context, WidgetStyle style, QWidget setAttribute(Qt::WA_QuitOnClose, false); // don't prevent Qt Creator from closing } if (style != SideBarWidget) { - m_toggleSideBarAction = new QAction(Core::Icons::TOGGLE_SIDEBAR.icon(), + m_toggleSideBarAction = new QAction(Core::Icons::TOGGLE_SIDEBAR_TOOLBAR.icon(), QCoreApplication::translate("Core", Core::Constants::TR_SHOW_SIDEBAR), toolBar); m_toggleSideBarAction->setCheckable(true); @@ -164,7 +164,7 @@ HelpWidget::HelpWidget(const Core::Context &context, WidgetStyle style, QWidget connect(m_homeAction, &QAction::triggered, this, &HelpWidget::goHome); layout->addWidget(Core::Command::toolButtonWithAppendedShortcut(m_homeAction, cmd)); - m_backAction = new QAction(Core::Icons::PREV.icon(), tr("Back"), toolBar); + m_backAction = new QAction(Core::Icons::PREV_TOOLBAR.icon(), tr("Back"), toolBar); connect(m_backAction, &QAction::triggered, this, &HelpWidget::backward); m_backMenu = new QMenu(toolBar); connect(m_backMenu, &QMenu::aboutToShow, this, &HelpWidget::updateBackMenu); @@ -175,7 +175,7 @@ HelpWidget::HelpWidget(const Core::Context &context, WidgetStyle style, QWidget button->setPopupMode(QToolButton::DelayedPopup); layout->addWidget(button); - m_forwardAction = new QAction(Core::Icons::NEXT.icon(), tr("Forward"), toolBar); + m_forwardAction = new QAction(Core::Icons::NEXT_TOOLBAR.icon(), tr("Forward"), toolBar); connect(m_forwardAction, &QAction::triggered, this, &HelpWidget::forward); m_forwardMenu = new QMenu(toolBar); connect(m_forwardMenu, &QMenu::aboutToShow, this, &HelpWidget::updateForwardMenu); |