diff options
author | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-04-23 09:39:09 +0200 |
---|---|---|
committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-04-23 09:39:09 +0200 |
commit | 6c2c5052288e399a7abfac714a3cbab3795a3baf (patch) | |
tree | 2ca5ac33e761fe4168707a08b9bee1bd5d91f427 /src/plugins/help | |
parent | c2c18b3c8ea61ea3f4f3898f9236fb699d02b16a (diff) | |
parent | c92adf5ab472a8d886034bbfe67aebb22d932270 (diff) | |
download | qt-creator-6c2c5052288e399a7abfac714a3cbab3795a3baf.tar.gz |
Merge remote-tracking branch 'origin/3.4'
Diffstat (limited to 'src/plugins/help')
-rw-r--r-- | src/plugins/help/helpwidget.cpp | 8 | ||||
-rw-r--r-- | src/plugins/help/searchwidget.cpp | 3 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/plugins/help/helpwidget.cpp b/src/plugins/help/helpwidget.cpp index 0d62fa81a1..69d07e4b21 100644 --- a/src/plugins/help/helpwidget.cpp +++ b/src/plugins/help/helpwidget.cpp @@ -303,7 +303,7 @@ void HelpWidget::addSideBar() auto contentWindow = new ContentWindow; auto contentItem = new Core::SideBarItem(contentWindow, QLatin1String(Constants::HELP_CONTENTS)); contentWindow->setOpenInNewPageActionVisible(supportsNewPages); - contentWindow->setWindowTitle(tr(Constants::SB_CONTENTS)); + contentWindow->setWindowTitle(HelpPlugin::tr(Constants::SB_CONTENTS)); connect(contentWindow, &ContentWindow::linkActivated, this, &HelpWidget::open); m_contentsAction = new QAction(tr(Constants::SB_CONTENTS), this); @@ -315,7 +315,7 @@ void HelpWidget::addSideBar() auto indexWindow = new IndexWindow(); auto indexItem = new Core::SideBarItem(indexWindow, QLatin1String(Constants::HELP_INDEX)); indexWindow->setOpenInNewPageActionVisible(supportsNewPages); - indexWindow->setWindowTitle(tr(Constants::SB_INDEX)); + indexWindow->setWindowTitle(HelpPlugin::tr(Constants::SB_INDEX)); connect(indexWindow, &IndexWindow::linkActivated, this, &HelpWidget::open); connect(indexWindow, &IndexWindow::linksActivated, @@ -327,7 +327,7 @@ void HelpWidget::addSideBar() shortcutMap.insert(QLatin1String(Constants::HELP_INDEX), cmd); auto bookmarkWidget = new BookmarkWidget(&LocalHelpManager::bookmarkManager()); - bookmarkWidget->setWindowTitle(tr(Constants::SB_BOOKMARKS)); + bookmarkWidget->setWindowTitle(HelpPlugin::tr(Constants::SB_BOOKMARKS)); bookmarkWidget->setOpenInNewPageActionVisible(supportsNewPages); auto bookmarkItem = new Core::SideBarItem(bookmarkWidget, QLatin1String(Constants::HELP_BOOKMARKS)); @@ -351,7 +351,7 @@ void HelpWidget::addSideBar() Core::SideBarItem *openPagesItem = 0; if (m_style == ModeWidget) { QWidget *openPagesWidget = OpenPagesManager::instance().openPagesWidget(); - openPagesWidget->setWindowTitle(tr(Constants::SB_OPENPAGES)); + openPagesWidget->setWindowTitle(HelpPlugin::tr(Constants::SB_OPENPAGES)); openPagesItem = new Core::SideBarItem(openPagesWidget, QLatin1String(Constants::HELP_OPENPAGES)); m_openPagesAction = new QAction(tr("Activate Open Help Pages View"), this); diff --git a/src/plugins/help/searchwidget.cpp b/src/plugins/help/searchwidget.cpp index 27dba03a9d..8a993eb942 100644 --- a/src/plugins/help/searchwidget.cpp +++ b/src/plugins/help/searchwidget.cpp @@ -30,6 +30,7 @@ #include "searchwidget.h" #include "helpconstants.h" +#include "helpplugin.h" #include "localhelpmanager.h" #include "openpagesmanager.h" @@ -303,7 +304,7 @@ QStringList SearchWidget::currentSearchTerms() const SearchSideBarItem::SearchSideBarItem() : SideBarItem(new SearchWidget, QLatin1String(Constants::HELP_SEARCH)) { - widget()->setWindowTitle(tr(Constants::SB_SEARCH)); + widget()->setWindowTitle(HelpPlugin::tr(Constants::SB_SEARCH)); connect(widget(), SIGNAL(linkActivated(QUrl,QStringList,bool)), this, SIGNAL(linkActivated(QUrl,QStringList,bool))); } |