diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2014-07-18 14:04:51 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2014-07-18 14:04:51 +0200 |
| commit | c571ecbd5106abebdd3f5867d53147e8b4b00f89 (patch) | |
| tree | 6c354316a35161600a423a9c823113f366bdc666 /src/plugins/coreplugin/find/findtoolbar.cpp | |
| parent | 292cf6c9e87d2c293be6eb2808530dbbd728c8b6 (diff) | |
| parent | 7dfb7df471ef81a20f45693a2c54a130aca5786a (diff) | |
| download | qt-creator-c571ecbd5106abebdd3f5867d53147e8b4b00f89.tar.gz | |
Merge remote-tracking branch 'origin/3.2'
Conflicts:
src/plugins/git/changeselectiondialog.cpp
src/plugins/git/changeselectiondialog.h
src/plugins/git/gerrit/gerritplugin.cpp
src/plugins/git/gitclient.cpp
src/plugins/git/gitclient.h
src/plugins/git/gitsettings.cpp
src/plugins/git/gitsettings.h
src/plugins/git/mergetool.cpp
Change-Id: Icd1b2741da96395ed1b41903f453049a303e4791
Diffstat (limited to 'src/plugins/coreplugin/find/findtoolbar.cpp')
| -rw-r--r-- | src/plugins/coreplugin/find/findtoolbar.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/coreplugin/find/findtoolbar.cpp b/src/plugins/coreplugin/find/findtoolbar.cpp index 03d3131eec..e15a75e21d 100644 --- a/src/plugins/coreplugin/find/findtoolbar.cpp +++ b/src/plugins/coreplugin/find/findtoolbar.cpp @@ -148,7 +148,7 @@ FindToolBar::FindToolBar(FindPlugin *plugin, CurrentDocumentFind *currentDocumen m_ui.advancedButton->setDefaultAction(Core::ActionManager::command(Constants::ADVANCED_FIND)->action()); - m_goToCurrentFindAction = new QAction(tr("Go to Current Document Find"), this); + m_goToCurrentFindAction = new QAction(this); Core::ActionManager::registerAction(m_goToCurrentFindAction, Constants::S_RETURNTOEDITOR, Context(Constants::C_FINDTOOLBAR)); connect(m_goToCurrentFindAction, SIGNAL(triggered()), this, SLOT(setFocusToCurrentFindSupport())); |