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:
	kdeui/widgets/kdatecombobox.cpp
	kfile/knewfilemenu.cpp
	nepomuk/core/resourcedata.cpp
	nepomuk/core/resourcewatcher.cpp
	nepomuk/core/resourcewatcher.h
	tier1/kcoreaddons/src/caching/kshareddatacache.cpp
This commit is contained in:
Stephen Kelly 2012-03-15 23:33:05 +01:00
commit b8f345c3e2
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
widgets/lineedit.cpp
View File

@ -64,10 +64,12 @@ LineEdit::LineEdit(QGraphicsWidget *parent)
d->background->setImagePath("widgets/lineedit"); d->background->setImagePath("widgets/lineedit");
d->background->setCacheAllRenderedFrames(true); d->background->setCacheAllRenderedFrames(true);
#if 0 // causes bug 290111
FocusIndicator *indicator = new FocusIndicator(this, d->background); FocusIndicator *indicator = new FocusIndicator(this, d->background);
if (d->background->hasElement("hint-focus-over-base")) { if (d->background->hasElement("hint-focus-over-base")) {
indicator->setFlag(QGraphicsItem::ItemStacksBehindParent, false); indicator->setFlag(QGraphicsItem::ItemStacksBehindParent, false);
} }
#endif
setNativeWidget(new KLineEdit); setNativeWidget(new KLineEdit);
} }