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

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

Browse Source 
Conflicts:
	kdecore/CMakeLists.txt
	tier2/kauth/src/backends/dbus/DBusHelperProxy.cpp
This commit is contained in:
Stephen Kelly 2012-06-18 11:33:08 +02:00
commit 21a5833090
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
framesvg.cpp
View File

@ -682,7 +682,7 @@ void FrameSvgPrivate::generateBackground(FrameData *frame)
Theme *theme = Theme::defaultTheme(); Theme *theme = Theme::defaultTheme();
bool frameCached = !frame->cachedBackground.isNull(); bool frameCached = !frame->cachedBackground.isNull();
bool overlayCached = false; bool overlayCached = false;
const bool overlayAvailable = !prefix.startsWith("mask-") && q->hasElement(prefix % "overlay"); const bool overlayAvailable = !prefix.startsWith(QLatin1String("mask-")) && q->hasElement(prefix % "overlay");
QPixmap overlay; QPixmap overlay;
if (q->isUsingRenderingCache()) { if (q->isUsingRenderingCache()) {
frameCached = theme->findInCache(id, frame->cachedBackground) && !frame->cachedBackground.isNull(); frameCached = theme->findInCache(id, frame->cachedBackground) && !frame->cachedBackground.isNull();

2
svg.cpp
View File

@ -552,7 +552,7 @@ void SvgPrivate::checkColorHints()
} }
} }
//Folowing two are utility functions to snap rendered elements to the pixel grid //Following two are utility functions to snap rendered elements to the pixel grid
//to and from are always 0 <= val <= 1 //to and from are always 0 <= val <= 1
qreal SvgPrivate::closestDistance(qreal to, qreal from) qreal SvgPrivate::closestDistance(qreal to, qreal from)
{ {