feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/3.2'

Browse Source 
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/android/androidglobal.h

Change-Id: I3367bf2ea47c088989175dddeed2210294346f4c
This commit is contained in:
Oswald Buddenhagen
2014-08-05 14:24:23 +02:00
parent 59b34b6b53 b2ac3fd90c
commit f3a61e8bf7
239 changed files with 3370 additions and 2107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/coreplugin/find/findtoolbar.cpp
View File

@@ -349,8 +349,6 @@ void FindToolBar::updateToolBar()
bool replaceEnabled = enabled && m_currentDocumentFind->supportsReplace();
bool showAllControls = canShowAllControls(replaceEnabled);
m_goToCurrentFindAction->setEnabled(enabled);
m_findNextAction->setEnabled(enabled);
m_findPreviousAction->setEnabled(enabled);
@@ -615,9 +613,11 @@ void FindToolBar::updateFlagMenus()
m_preserveCaseAction->setEnabled((supportedFlags & FindPreserveCase) && !regexp && replaceEnabled);
}
bool FindToolBar::setFocusToCurrentFindSupport()
void FindToolBar::setFocusToCurrentFindSupport()
{
return m_currentDocumentFind->setFocusToCurrentFindSupport();
if (!m_currentDocumentFind->setFocusToCurrentFindSupport())
if (QWidget *w = focusWidget())
w->clearFocus();
}
void FindToolBar::hideAndResetFocus()