diff options
| author | Eike Ziller <[email protected]> | 2016-05-03 11:49:01 +0200 |
|---|---|---|
| committer | Eike Ziller <[email protected]> | 2016-05-03 11:49:01 +0200 |
| commit | 0f94aa3f4d8c38d0fb247f2e56b4153b03bc43b9 (patch) | |
| tree | 092bf6aab0688c0cae20e0d355cc7d75fd614378 /src/plugins/qmlprofiler/qmlprofilertraceview.cpp | |
| parent | 5fa52d2ff9a93110cff38cf43c16268515fed937 (diff) | |
| parent | 9b69b789ab8a7ccc0f7c251f364f232f2a41c7fd (diff) | |
Merge remote-tracking branch 'origin/4.0'
Conflicts:
src/plugins/debugger/debuggerruncontrol.cpp
src/plugins/projectexplorer/projectwizardpage.cpp
src/plugins/projectexplorer/xcodebuildparser.h
src/plugins/qmldesigner/qmldesignerplugin.cpp
src/tools/clangbackend/ipcsource/translationunits.cpp
Change-Id: Ibf0857cf8dbf95fc9ac13d5c2112b3f4a2ca7de6
Diffstat (limited to 'src/plugins/qmlprofiler/qmlprofilertraceview.cpp')
| -rw-r--r-- | src/plugins/qmlprofiler/qmlprofilertraceview.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/qmlprofiler/qmlprofilertraceview.cpp b/src/plugins/qmlprofiler/qmlprofilertraceview.cpp index abaf85b058d..165f15f1e49 100644 --- a/src/plugins/qmlprofiler/qmlprofilertraceview.cpp +++ b/src/plugins/qmlprofiler/qmlprofilertraceview.cpp @@ -384,7 +384,10 @@ bool TraceViewFindSupport::findOne(const QString &txt, Core::FindFlags findFlags m_currentPosition = current; m_view->selectByEventIndex(model->timelineModel(m_currentPosition), model->timelineIndex(m_currentPosition)); + QWidget *findBar = QApplication::focusWidget(); m_view->updateCursorPosition(); // open file/line that belongs to event + QTC_ASSERT(findBar, return true); + findBar->setFocus(); return true; } current += increment; |