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:
	qtcreator.pri
	src/libs/qmljs/qmljscheck.cpp
	src/plugins/debugger/gdb/gdbengine.cpp
	src/plugins/debugger/gdb/remotegdbserveradapter.cpp
	src/plugins/plugins.pro
	src/plugins/projectexplorer/buildmanager.cpp
	src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp

Change-Id: Id2dcebf95b94dc46c1d85908ba1d1378aaf362ac
This commit is contained in:
Eike Ziller
2011-10-28 10:17:44 +02:00
parent 2ee0b36342 5dcf7d2ef0
commit 81cce8902e
214 changed files with 35000 additions and 21166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/valgrind/memcheckerrorview.cpp
View File

@@ -361,7 +361,7 @@ void MemcheckErrorDelegate::paint(QPainter *painter, const QStyleOptionViewItem
}
}
// Separator lines (like build issues pane)
// Separator lines (like Issues pane)
painter->setPen(QColor::fromRgb(150,150,150));
painter->drawLine(0, opt.rect.bottom(), opt.rect.right(), opt.rect.bottom());