diff options
| author | Eike Ziller <[email protected]> | 2012-12-14 08:20:49 +0100 |
|---|---|---|
| committer | Eike Ziller <[email protected]> | 2012-12-14 08:20:49 +0100 |
| commit | a8a33b9a3b2bab7660a53919bfbfa011e31755d3 (patch) | |
| tree | 0d091c18a3e3b666c91d6562ce6f59400a997362 /src/plugins/find/findtoolbar.cpp | |
| parent | fe6be533bc8942617d3a7a7b6b554b5298b492b7 (diff) | |
| parent | 6d83dda6df643eca4c720cb474cc5636d8e60ff5 (diff) | |
Merge remote-tracking branch 'origin/2.6'
Conflicts:
src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
src/plugins/qtsupport/baseqtversion.cpp
Change-Id: I288eeb1137e1b08d6c0d69f394cbb0fe1a937b68
Diffstat (limited to 'src/plugins/find/findtoolbar.cpp')
| -rw-r--r-- | src/plugins/find/findtoolbar.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/plugins/find/findtoolbar.cpp b/src/plugins/find/findtoolbar.cpp index 6d35df5d480..47a72db22f0 100644 --- a/src/plugins/find/findtoolbar.cpp +++ b/src/plugins/find/findtoolbar.cpp @@ -115,8 +115,11 @@ FindToolBar::FindToolBar(FindPlugin *plugin, CurrentDocumentFind *currentDocumen m_ui.replaceEdit->setPlaceholderText(QString()); connect(m_ui.findEdit, SIGNAL(textChanged(QString)), this, SLOT(invokeFindIncremental())); - connect(m_ui.findEdit, SIGNAL(returnPressed()), this, SLOT(invokeFindEnter())); - connect(m_ui.replaceEdit, SIGNAL(returnPressed()), this, SLOT(invokeReplaceEnter())); + + // invoke{Find,Replace}Helper change the completion model. QueuedConnection is used to perform these + // changes only after the completer's activated() signal is handled (QTCREATORBUG-8408) + connect(m_ui.findEdit, SIGNAL(returnPressed()), this, SLOT(invokeFindEnter()), Qt::QueuedConnection); + connect(m_ui.replaceEdit, SIGNAL(returnPressed()), this, SLOT(invokeReplaceEnter()), Qt::QueuedConnection); QAction *shiftEnterAction = new QAction(m_ui.findEdit); shiftEnterAction->setShortcut(QKeySequence(tr("Shift+Enter"))); |