generic: fix build against Katie

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/kdeplasma-addons/applets/previewer/previewwidget.h b/kdeplasma-addons/applets/previewer/previewwidget.h
index 34916e3..2ad4f85 100644 (file)
--- a/kdeplasma-addons/applets/previewer/previewwidget.h
+++ b/kdeplasma-addons/applets/previewer/previewwidget.h
@@ -31,7 +31,11 @@ class FrameSvg;
 class Svg;
 }
 
+#ifndef QT_KATIE
 class QStyleOptionViewItemV4;
+#else
+class QStyleOptionViewItem;
+#endif
 class KUrl;
 class QGraphicsSceneWheelEvent;
 class QGraphicsSceneResizeEvent;

diff --git a/kdeplasma-addons/containments/groupingdesktop/lib/handle.cpp b/kdeplasma-addons/containments/groupingdesktop/lib/handle.cpp
index 1d5b99a..87fcd74 100644 (file)
--- a/kdeplasma-addons/containments/groupingdesktop/lib/handle.cpp
+++ b/kdeplasma-addons/containments/groupingdesktop/lib/handle.cpp
@@ -68,7 +68,7 @@ Handle::Handle(GroupingContainment *parent, AbstractGroup *group)
         m_widget(group),
         m_currentView(group->view())
 {
-    setAcceptsHoverEvents(true);
+    setAcceptHoverEvents(true);
     setAcceptTouchEvents(true);
 }
 
@@ -144,7 +144,7 @@ void Handle::switchContainment(GroupingContainment *containment, const QPointF &
         Applet *applet = m_applet;
         m_applet = 0; //make sure we don't try to act on the applet again
         applet->removeSceneEventFilter(this);
-        setAcceptsHoverEvents(false);
+        setAcceptHoverEvents(false);
 //         forceDisappear(); //takes care of event filter and killing handle
         applet->disconnect(this); //make sure the applet doesn't tell us to do anything
         //applet->setZValue(m_zValue);
@@ -153,7 +153,7 @@ void Handle::switchContainment(GroupingContainment *containment, const QPointF &
         AbstractGroup *group = m_group;
         m_group = 0; //make sure we don't try to act on the applet again
         group->removeSceneEventFilter(this);
-        setAcceptsHoverEvents(false);
+        setAcceptHoverEvents(false);
 //         forceDisappear(); //takes care of event filter and killing handle
         group->disconnect(this); //make sure the applet doesn't tell us to do anything
         //applet->setZValue(m_zValue);