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

Merge remote-tracking branch 'origin/4.8'

Browse Source 
Conflicts:
	src/plugins/android/androidrunnerworker.cpp

Change-Id: Ibd8b99435365fb7e7d488313fd1d2b3a75adad1b
This commit is contained in:
Eike Ziller
2018-11-29 12:59:51 +01:00
parent ba4c434211 9eb66a806f
commit 29c9f8080d
63 changed files with 638 additions and 287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/debugger/threadshandler.cpp
View File

@@ -408,6 +408,11 @@ void ThreadsHandler::setThreads(const GdbMi &data)
if (!m_currentThread && threads.childCount() > 0)
m_currentThread = rootItem()->childAt(0);
if (!m_currentThread) {
const QModelIndex currentThreadIndex = m_currentThread->index();
threadSwitcher()->setCurrentIndex(currentThreadIndex.row());
}
}
QAbstractItemModel *ThreadsHandler::model()