diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2014-04-08 11:18:40 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2014-04-08 11:18:40 +0200 |
| commit | b6876586635e9c610b8362dae9c6f5e7bce9d08d (patch) | |
| tree | ffdca9894ca6e5b09e321ce0728a0ff6b9862fa6 /src/plugins/coreplugin/find/findtoolbar.cpp | |
| parent | 49bbd218cb2489abf31fae176a417621cf8885e8 (diff) | |
| parent | 780c21a1c3b5ac6b759b7423588011c89b2dad34 (diff) | |
| download | qt-creator-b6876586635e9c610b8362dae9c6f5e7bce9d08d.tar.gz | |
Merge remote-tracking branch 'origin/3.1'
Conflicts:
qtcreator.pri
qtcreator.qbs
src/plugins/cpptools/cppcompletion_test.cpp
Change-Id: Ic5e75b3ef164de664a1449ffa8579beaf5b02521
Diffstat (limited to 'src/plugins/coreplugin/find/findtoolbar.cpp')
| -rw-r--r-- | src/plugins/coreplugin/find/findtoolbar.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/coreplugin/find/findtoolbar.cpp b/src/plugins/coreplugin/find/findtoolbar.cpp index 9d248cdd23..34061ad6ab 100644 --- a/src/plugins/coreplugin/find/findtoolbar.cpp +++ b/src/plugins/coreplugin/find/findtoolbar.cpp @@ -337,6 +337,8 @@ void FindToolBar::updateFindAction() m_findInDocumentAction->setEnabled(enabled); m_findNextSelectedAction->setEnabled(enabled); m_findPreviousSelectedAction->setEnabled(enabled); + if (QApplication::clipboard()->supportsFindBuffer()) + m_enterFindStringAction->setEnabled(enabled); } void FindToolBar::updateToolBar() @@ -358,8 +360,6 @@ void FindToolBar::updateToolBar() m_wholeWordAction->setEnabled(enabled); m_regularExpressionAction->setEnabled(enabled); m_preserveCaseAction->setEnabled(replaceEnabled && !hasFindFlag(FindRegularExpression)); - if (QApplication::clipboard()->supportsFindBuffer()) - m_enterFindStringAction->setEnabled(enabled); bool replaceFocus = m_ui.replaceEdit->hasFocus(); m_ui.findEdit->setEnabled(enabled); m_ui.findLabel->setEnabled(enabled); @@ -516,6 +516,7 @@ void FindToolBar::invokeResetIncrementalSearch() void FindToolBar::putSelectionToFindClipboard() { + openFind(false); const QString text = m_currentDocumentFind->currentFindString(); QApplication::clipboard()->setText(text, QClipboard::FindBuffer); setFindText(text); |