[Kst] branches/work/kst/portto4/kst/src/libkstapp

[Mike Fenton]

SVN commit 857083 by fenton:

Fix crash with Qt 4.4.X matching items differently than 4.3.X


 M  +1 -4      viewitem.cpp  


--- branches/work/kst/portto4/kst/src/libkstapp/viewitem.cpp #857082:857083
@@ -1266,7 +1266,7 @@
 
 bool ViewItem::maybeReparent() {
   //First get a list of all items that collide with this one
-  QList<QGraphicsItem*> collisions = collidingItems(Qt::IntersectsItemShape);
+  QList<QGraphicsItem*> collisions = collidingItems(Qt::ContainsItemShape);
 
   bool topLevel = !parentItem();
   QPointF origin = mapToScene(QPointF(0,0));
@@ -1319,9 +1319,6 @@
     if (!viewItem || !viewItem->acceptsChildItems()) /*bah*/
       continue;
 
-    if (!viewItem->collidesWithItem(this, Qt::ContainsItemShape)) /*doesn't contain*/
-      continue;
-
     if (parentItem() == viewItem) { /*already done*/
 #ifdef DEBUG_REPARENT
       qDebug() << "already in containing parent" << endl;