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

Merge remote-tracking branch 'origin/2.5'

Browse Source 
Conflicts:
	doc/templates/style/style.css
	qtcreator.pri

Change-Id: I5f4f5f191726883dae18cb760733a5e8e6bd4e7d
This commit is contained in:
Eike Ziller
2012-04-27 17:02:39 +02:00
parent 6c5bec6e65 29062c64f7
commit 9092e70884
28 changed files with 735 additions and 378 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/debugger/breakhandler.cpp
View File

@@ -1426,8 +1426,10 @@ bool BreakHandler::BreakpointItem::isLocatedAt
void BreakHandler::BreakpointItem::updateMarkerIcon()
{
marker->setIcon(icon());
marker->updateMarker();
if (marker) {
marker->setIcon(icon());
marker->updateMarker();
}
}
void BreakHandler::BreakpointItem::updateMarker(BreakpointModelId id)