Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

3 files changed, 18 insertions, 26 deletions

diff --git a/src/declarative/graphicsitems/qmlgraphicslistview.cpp b/src/declarative/graphicsitems/qmlgraphicslistview.cpp
index 658cfaa..2711059 100644
--- a/src/declarative/graphicsitems/qmlgraphicslistview.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicslistview.cpp
@@ -497,10 +497,8 @@ void QmlGraphicsListViewPrivate::init()
     QObject::connect(q, SIGNAL(widthChanged()), q, SLOT(refill()));
     QObject::connect(q, SIGNAL(movementEnded()), q, SLOT(animStopped()));
     q->setFlickDirection(QmlGraphicsFlickable::VerticalFlick);
-    if (itemResizedIdx == -1) {
+    if (itemResizedIdx == -1)
         itemResizedIdx = QmlGraphicsListView::staticMetaObject.indexOfSlot("itemResized()");
-        qDebug() << "ri" << itemResizedIdx;
-    }
 }
 
 void QmlGraphicsListViewPrivate::clear()
@@ -1914,26 +1912,23 @@ void QmlGraphicsListView::viewportMoved()
         }
     }
 
-    if ((d->haveHighlightRange && d->highlightRange == QmlGraphicsListView::StrictlyEnforceRange)
-        || d->snapMode == QmlGraphicsListView::SnapToItem) {
-        if (d->flicked && d->correctFlick) {
-            // Near an end and it seems that the extent has changed?
-            // Recalculate the flick so that we don't end up in an odd position.
-            if (d->velocityY > 0) {
-                if (d->flickTargetY - d->_moveY.value() < height()/2 && minYExtent() != d->flickTargetY)
-                    d->flickY(-d->verticalVelocity.value());
-            } else if (d->velocityY < 0) {
-                if (d->_moveY.value() - d->flickTargetY < height()/2 && maxYExtent() != d->flickTargetY)
-                    d->flickY(-d->verticalVelocity.value());
-            }
+    if (d->flicked && d->correctFlick) {
+        // Near an end and it seems that the extent has changed?
+        // Recalculate the flick so that we don't end up in an odd position.
+        if (d->velocityY > 0) {
+            if (d->flickTargetY - d->_moveY.value() < height()/2 && minYExtent() != d->flickTargetY)
+                d->flickY(-d->verticalVelocity.value());
+        } else if (d->velocityY < 0) {
+            if (d->_moveY.value() - d->flickTargetY < height()/2 && maxYExtent() != d->flickTargetY)
+                d->flickY(-d->verticalVelocity.value());
+        }
 
-            if (d->velocityX > 0) {
-                if (d->flickTargetX - d->_moveX.value() < height()/2 && minXExtent() != d->flickTargetX)
-                    d->flickX(-d->verticalVelocity.value());
-            } else if (d->velocityX < 0) {
-                if (d->_moveX.value() - d->flickTargetX < height()/2 && maxXExtent() != d->flickTargetX)
-                    d->flickX(-d->verticalVelocity.value());
-            }
+        if (d->velocityX > 0) {
+            if (d->flickTargetX - d->_moveX.value() < height()/2 && minXExtent() != d->flickTargetX)
+                d->flickX(-d->verticalVelocity.value());
+        } else if (d->velocityX < 0) {
+            if (d->_moveX.value() - d->flickTargetX < height()/2 && maxXExtent() != d->flickTargetX)
+                d->flickX(-d->verticalVelocity.value());
         }
     }
 }
diff --git a/src/declarative/graphicsitems/qmlgraphicstext.cpp b/src/declarative/graphicsitems/qmlgraphicstext.cpp
index 854d503..ad12189 100644
--- a/src/declarative/graphicsitems/qmlgraphicstext.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicstext.cpp
@@ -121,8 +121,6 @@ QmlGraphicsText::~QmlGraphicsText()
 
 QmlGraphicsTextPrivate::~QmlGraphicsTextPrivate()
 {
-    delete control;
-    delete doc;
 }
 
 /*!
diff --git a/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel.cpp b/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel.cpp
index b973d6c..a6c40c5 100644
--- a/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsvisualitemmodel.cpp
@@ -761,8 +761,7 @@ QmlGraphicsVisualDataModel::ReleaseFlags QmlGraphicsVisualDataModel::release(Qml
         if (inPackage)
             emit destroyingPackage(qobject_cast<QmlPackage*>(obj));
         stat |= Destroyed;
-        obj->setParent(0);
-        obj->deleteLater();
+        delete obj;
     } else if (!inPackage) {
         stat |= Referenced;
     }