alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	kdeui/fonts/kfontchooser.cpp [same mess as in master]
	kdeui/jobs/kdialogjobuidelegate.cpp [moc]
	kjs/tests/ecmatest_broken_ch15 [rename/rename]
	kjs/tests/ecmatest_broken_ch15.2 [rename/rename]
	nepomuk/core/resourcedata.cpp [gone]
	nepomuk/core/resourcewatcher.cpp [gone]
	nepomuk/core/resourcewatcher.h [gone]
	tier1/kjs/autotests/ecmatest_broken_ch15 [rename/rename]
This commit is contained in:
David Faure 2012-09-16 11:44:07 +02:00
commit 6620a16b73
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
widgets/signalplotter.cpp
View File

@ -690,7 +690,7 @@ void SignalPlotter::drawWidget(QPainter *p, uint w, uint height, int horizontalS
drawTopBarContents(p, separatorX, topBarWidth, top -1); 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 // Draw scope-like grid vertical lines
if (d->verticalLinesScroll && d->showVerticalLines && w > 60) { if (d->verticalLinesScroll && d->showVerticalLines && w > 60) {
drawVerticalLines(p, top, w, h); drawVerticalLines(p, top, w, h);