Make plasma build.

2011-11-22 22:56:29 +01:00 · 2011-11-22 22:56:29 +01:00 · 6117d99a7b
commit 6117d99a7b
parent 685ae3b6c5
2 changed files with 1 additions and 2 deletions
--- a/popupapplet.cpp
+++ b/popupapplet.cpp
@ -157,7 +157,7 @@ void PopupApplet::setWidget(QWidget *widget)

 QGraphicsWidget *PopupApplet::graphicsWidget()
 {
-    return d->graphicsWidget;
+    return d->graphicsWidget.data();
 }

 void PopupApplet::setGraphicsWidget(QGraphicsWidget *graphicsWidget)
--- a/runnermanager.cpp
+++ b/runnermanager.cpp
@ -251,7 +251,6 @@ public:
                qDeleteAll(deadRunners);
            } else {
                new DelayedJobCleaner(deadJobs, deadRunners);
->>>>>>> origin/KDE/4.7
            }
        }