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

Merge remote-tracking branch 'origin/2.4'

Browse Source 
Conflicts:
	src/plugins/projectexplorer/gcctoolchain.cpp

Change-Id: I516c496175afe94c57b8a1dd978d9c5cccc44610
This commit is contained in:
Leandro Melo
2011-12-21 17:17:14 +01:00
parent 34ed3f295b d5b655131b
commit 3b67e5dd37
4 changed files with 27 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/debugger/cdb/cdbengine.cpp
View File

@@ -1544,7 +1544,6 @@ void CdbEngine::selectThread(int index)
if (index < 0 || index == threadsHandler()->currentThread())
return;
resetLocation();
const int newThreadId = threadsHandler()->threads().at(index).id;
threadsHandler()->setCurrentThread(index);