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

containment.h

@@ -664,6 +664,7 @@ Q_SIGNALS:
         friend class ContainmentPrivate;
         friend class ContainmentActions;
         friend class PopupApplet;
+        friend class View;
         ContainmentPrivate *const d;
 };
 

view.cpp

@@ -28,6 +28,7 @@
 
 #include "corona.h"
 #include "containment.h"
+#include "private/containment_p.h"
 #include "wallpaper.h"
 
 using namespace Plasma;
@@ -338,13 +339,8 @@ Containment *View::swapContainment(Plasma::Containment *existing, const QString
         // load the configuration of the old containment into the new one
         c->restore(newConfig);
         c->updateConstraints(Plasma::StartupCompletedConstraint);
-        c->flushPendingConstraintsEvents();
+        c->d->initApplets();
         emit corona->containmentAdded(c);
-        foreach (Applet *applet, c->applets()) {
-            applet->init();
-            // We have to flush the applet constraints manually
-            applet->flushPendingConstraintsEvents();
-        }
 
         // destroy the old one
         old->destroy(false);

widgets/lineedit.cpp

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