Merge remote-tracking branch 'origin/2.5'

This commit is contained in:
Eike Ziller
2012-05-07 15:18:39 +02:00
36 changed files with 7212 additions and 1120 deletions

View File

@@ -999,7 +999,9 @@ void CallgrindToolPrivate::createTextMarks()
continue;
locations << location;
m_textMarks.append(new CallgrindTextMark(index, fileName, lineNumber));
CallgrindTextMark *mark = new CallgrindTextMark(index, fileName, lineNumber);
mark->init();
m_textMarks.append(mark);
}
}