Merge remote-tracking branch 'origin/KDE/4.10'

This commit is contained in:
David Faure 2012-09-13 18:02:04 +02:00
commit bca9be6a0e

View File

@ -682,7 +682,7 @@ void SignalPlotter::drawWidget(QPainter *p, uint w, uint height, int horizontalS
drawTopBarContents(p, separatorX, topBarWidth, top -1);
}
p->setClipRect(0, top, w, h);
p->setClipRect(0, top, w, h, Qt::IntersectClip);
// Draw scope-like grid vertical lines
if (d->verticalLinesScroll && d->showVerticalLines && w > 60) {
drawVerticalLines(p, top, w, h);