Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
  Border still drawn on Rectangle elements when border.width == 0
  Regression: currentIndex was not set correctly after model cleared.
  Remove bindings before assigning constants in VME

4 files changed, 72 insertions, 7 deletions

diff --git a/src/declarative/graphicsitems/qdeclarativegridview.cpp b/src/declarative/graphicsitems/qdeclarativegridview.cpp
index 5c2f781..c0cbed0 100644
--- a/src/declarative/graphicsitems/qdeclarativegridview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativegridview.cpp
@@ -2834,11 +2834,9 @@ void QDeclarativeGridView::itemsInserted(int modelIndex, int count)
         if (d->currentItem) {
             d->currentItem->index = d->currentIndex;
             d->currentItem->setPosition(d->colPosAt(d->currentIndex), d->rowPosAt(d->currentIndex));
-        } else if (!d->currentIndex || (d->currentIndex < 0 && !d->currentIndexCleared)) {
-            d->updateCurrent(0);
         }
         emit currentIndexChanged();
-    } else if (d->itemCount == 0 && d->currentIndex == -1) {
+    } else if (d->itemCount == 0 && (!d->currentIndex || (d->currentIndex < 0 && !d->currentIndexCleared))) {
         setCurrentIndex(0);
     }
 
@@ -2906,6 +2904,8 @@ void QDeclarativeGridView::itemsRemoved(int modelIndex, int count)
         d->currentIndex = -1;
         if (d->itemCount)
             d->updateCurrent(qMin(modelIndex, d->itemCount-1));
+        else
+            emit currentIndexChanged();
     }
 
     // update visibleIndex
diff --git a/src/declarative/graphicsitems/qdeclarativelistview.cpp b/src/declarative/graphicsitems/qdeclarativelistview.cpp
index 2c23a1b..6ae1ddc 100644
--- a/src/declarative/graphicsitems/qdeclarativelistview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativelistview.cpp
@@ -3272,10 +3272,10 @@ void QDeclarativeListView::itemsInserted(int modelIndex, int count)
         if (d->currentItem) {
             d->currentItem->index = d->currentIndex;
             d->currentItem->setPosition(d->currentItem->position() + diff);
-        } else if (!d->currentIndex || (d->currentIndex < 0 && !d->currentIndexCleared)) {
-            d->updateCurrent(0);
         }
         emit currentIndexChanged();
+    } else if (!d->itemCount && (!d->currentIndex || (d->currentIndex < 0 && !d->currentIndexCleared))) {
+        d->updateCurrent(0);
     }
     // Update the indexes of the following visible items.
     for (; index < d->visibleItems.count(); ++index) {
@@ -3356,6 +3356,8 @@ void QDeclarativeListView::itemsRemoved(int modelIndex, int count)
         d->currentIndex = -1;
         if (d->itemCount)
             d->updateCurrent(qMin(modelIndex, d->itemCount-1));
+        else
+            emit currentIndexChanged();
     }
 
     // update visibleIndex
diff --git a/src/declarative/graphicsitems/qdeclarativerectangle.cpp b/src/declarative/graphicsitems/qdeclarativerectangle.cpp
index d962919..8f59073 100644
--- a/src/declarative/graphicsitems/qdeclarativerectangle.cpp
+++ b/src/declarative/graphicsitems/qdeclarativerectangle.cpp
@@ -70,7 +70,7 @@ QT_BEGIN_NAMESPACE
 void QDeclarativePen::setColor(const QColor &c)
 {
     _color = c;
-    _valid = _color.alpha() ? true : false;
+    _valid = (_color.alpha() && _width >= 1) ? true : false;
     emit penChanged();
 }
 
@@ -80,7 +80,7 @@ void QDeclarativePen::setWidth(int w)
         return;
 
     _width = w;
-    _valid = (_width < 1) ? false : true;
+    _valid = (_color.alpha() && _width >= 1) ? true : false;
     emit penChanged();
 }
 
diff --git a/src/declarative/qml/qdeclarativevme.cpp b/src/declarative/qml/qdeclarativevme.cpp
index 2d551f2..781e1b8 100644
--- a/src/declarative/qml/qdeclarativevme.cpp
+++ b/src/declarative/qml/qdeclarativevme.cpp
@@ -127,6 +127,22 @@ void QDeclarativeVME::runDeferred(QObject *object)
     run(stack, ctxt, comp, start, count, QBitField());
 }
 
+inline bool fastHasBinding(QObject *o, int index) 
+{
+    QDeclarativeData *ddata = static_cast<QDeclarativeData *>(QObjectPrivate::get(o)->declarativeData);
+
+    return ddata && (ddata->bindingBitsSize > index) && 
+           (ddata->bindingBits[index / 32] & (1 << (index % 32)));
+}
+
+static void removeBindingOnProperty(QObject *o, int index)
+{
+    QDeclarativeAbstractBinding *binding = QDeclarativePropertyPrivate::setBinding(o, index, -1, 0);
+    if (binding) binding->destroy();
+}
+
+#define CLEAN_PROPERTY(o, index) if (fastHasBinding(o, index)) removeBindingOnProperty(o, index)
+
 QObject *QDeclarativeVME::run(QDeclarativeVMEStack<QObject *> &stack, 
                               QDeclarativeContextData *ctxt, 
                               QDeclarativeCompiledData *comp, 
@@ -336,6 +352,8 @@ QObject *QDeclarativeVME::run(QDeclarativeVMEStack<QObject *> &stack,
         case QDeclarativeInstruction::StoreVariant:
             {
                 QObject *target = stack.top();
+                CLEAN_PROPERTY(target, instr.storeString.propertyIndex);
+
                 // XXX - can be more efficient
                 QVariant v = QDeclarativeStringConverters::variantFromString(primitives.at(instr.storeString.value));
                 void *a[] = { &v, 0, &status, &flags };
@@ -347,6 +365,8 @@ QObject *QDeclarativeVME::run(QDeclarativeVMEStack<QObject *> &stack,
         case QDeclarativeInstruction::StoreVariantInteger:
             {
                 QObject *target = stack.top();
+                CLEAN_PROPERTY(target, instr.storeString.propertyIndex);
+
                 QVariant v(instr.storeInteger.value);
                 void *a[] = { &v, 0, &status, &flags };
                 QMetaObject::metacall(target, QMetaObject::WriteProperty, 
@@ -357,6 +377,8 @@ QObject *QDeclarativeVME::run(QDeclarativeVMEStack<QObject *> &stack,
         case QDeclarativeInstruction::StoreVariantDouble:
             {
                 QObject *target = stack.top();
+                CLEAN_PROPERTY(target, instr.storeString.propertyIndex);
+
                 QVariant v(instr.storeDouble.value);
                 void *a[] = { &v, 0, &status, &flags };
                 QMetaObject::metacall(target, QMetaObject::WriteProperty, 
@@ -367,6 +389,8 @@ QObject *QDeclarativeVME::run(QDeclarativeVMEStack<QObject *> &stack,
         case QDeclarativeInstruction::StoreVariantBool:
             {
                 QObject *target = stack.top();
+                CLEAN_PROPERTY(target, instr.storeString.propertyIndex);
+
                 QVariant v(instr.storeBool.value);
                 void *a[] = { &v, 0, &status, &flags };
                 QMetaObject::metacall(target, QMetaObject::WriteProperty, 
@@ -377,6 +401,8 @@ QObject *QDeclarativeVME::run(QDeclarativeVMEStack<QObject *> &stack,
         case QDeclarativeInstruction::StoreString:
             {
                 QObject *target = stack.top();
+                CLEAN_PROPERTY(target, instr.storeString.propertyIndex);
+
                 void *a[] = { (void *)&primitives.at(instr.storeString.value), 0, &status, &flags };
                 QMetaObject::metacall(target, QMetaObject::WriteProperty, 
                                       instr.storeString.propertyIndex, a);
@@ -386,6 +412,8 @@ QObject *QDeclarativeVME::run(QDeclarativeVMEStack<QObject *> &stack,
         case QDeclarativeInstruction::StoreUrl:
             {
                 QObject *target = stack.top();
+                CLEAN_PROPERTY(target, instr.storeUrl.propertyIndex);
+
                 void *a[] = { (void *)&urls.at(instr.storeUrl.value), 0, &status, &flags };
                 QMetaObject::metacall(target, QMetaObject::WriteProperty, 
                                       instr.storeUrl.propertyIndex, a);
@@ -395,6 +423,8 @@ QObject *QDeclarativeVME::run(QDeclarativeVMEStack<QObject *> &stack,
         case QDeclarativeInstruction::StoreFloat:
             {
                 QObject *target = stack.top();
+                CLEAN_PROPERTY(target, instr.storeFloat.propertyIndex);
+
                 float f = instr.storeFloat.value;
                 void *a[] = { &f, 0, &status, &flags };
                 QMetaObject::metacall(target, QMetaObject::WriteProperty,
@@ -405,6 +435,8 @@ QObject *QDeclarativeVME::run(QDeclarativeVMEStack<QObject *> &stack,
         case QDeclarativeInstruction::StoreDouble:
             {
                 QObject *target = stack.top();
+                CLEAN_PROPERTY(target, instr.storeDouble.propertyIndex);
+
                 double d = instr.storeDouble.value;
                 void *a[] = { &d, 0, &status, &flags };
                 QMetaObject::metacall(target, QMetaObject::WriteProperty,
@@ -415,6 +447,8 @@ QObject *QDeclarativeVME::run(QDeclarativeVMEStack<QObject *> &stack,
         case QDeclarativeInstruction::StoreBool:
             {
                 QObject *target = stack.top();
+                CLEAN_PROPERTY(target, instr.storeBool.propertyIndex);
+
                 void *a[] = { (void *)&instr.storeBool.value, 0, &status, &flags };
                 QMetaObject::metacall(target, QMetaObject::WriteProperty, 
                                       instr.storeBool.propertyIndex, a);
@@ -424,6 +458,8 @@ QObject *QDeclarativeVME::run(QDeclarativeVMEStack<QObject *> &stack,
         case QDeclarativeInstruction::StoreInteger:
             {
                 QObject *target = stack.top();
+                CLEAN_PROPERTY(target, instr.storeInteger.propertyIndex);
+
                 void *a[] = { (void *)&instr.storeInteger.value, 0, &status, &flags };
                 QMetaObject::metacall(target, QMetaObject::WriteProperty, 
                                       instr.storeInteger.propertyIndex, a);
@@ -433,6 +469,8 @@ QObject *QDeclarativeVME::run(QDeclarativeVMEStack<QObject *> &stack,
         case QDeclarativeInstruction::StoreColor:
             {
                 QObject *target = stack.top();
+                CLEAN_PROPERTY(target, instr.storeColor.propertyIndex);
+
                 QColor c = QColor::fromRgba(instr.storeColor.value);
                 void *a[] = { &c, 0, &status, &flags };
                 QMetaObject::metacall(target, QMetaObject::WriteProperty, 
@@ -443,6 +481,8 @@ QObject *QDeclarativeVME::run(QDeclarativeVMEStack<QObject *> &stack,
         case QDeclarativeInstruction::StoreDate:
             {
                 QObject *target = stack.top();
+                CLEAN_PROPERTY(target, instr.storeDate.propertyIndex);
+
                 QDate d = QDate::fromJulianDay(instr.storeDate.value);
                 void *a[] = { &d, 0, &status, &flags };
                 QMetaObject::metacall(target, QMetaObject::WriteProperty, 
@@ -453,6 +493,8 @@ QObject *QDeclarativeVME::run(QDeclarativeVMEStack<QObject *> &stack,
         case QDeclarativeInstruction::StoreTime:
             {
                 QObject *target = stack.top();
+                CLEAN_PROPERTY(target, instr.storeTime.propertyIndex);
+
                 QTime t;
                 t.setHMS(intData.at(instr.storeTime.valueIndex),
                          intData.at(instr.storeTime.valueIndex+1),
@@ -467,6 +509,8 @@ QObject *QDeclarativeVME::run(QDeclarativeVMEStack<QObject *> &stack,
         case QDeclarativeInstruction::StoreDateTime:
             {
                 QObject *target = stack.top();
+                CLEAN_PROPERTY(target, instr.storeDateTime.propertyIndex);
+
                 QTime t;
                 t.setHMS(intData.at(instr.storeDateTime.valueIndex+1),
                          intData.at(instr.storeDateTime.valueIndex+2),
@@ -482,6 +526,8 @@ QObject *QDeclarativeVME::run(QDeclarativeVMEStack<QObject *> &stack,
         case QDeclarativeInstruction::StorePoint:
             {
                 QObject *target = stack.top();
+                CLEAN_PROPERTY(target, instr.storeRealPair.propertyIndex);
+
                 QPoint p = QPointF(floatData.at(instr.storeRealPair.valueIndex),
                                    floatData.at(instr.storeRealPair.valueIndex+1)).toPoint();
                 void *a[] = { &p, 0, &status, &flags };
@@ -493,6 +539,8 @@ QObject *QDeclarativeVME::run(QDeclarativeVMEStack<QObject *> &stack,
         case QDeclarativeInstruction::StorePointF:
             {
                 QObject *target = stack.top();
+                CLEAN_PROPERTY(target, instr.storeRealPair.propertyIndex);
+
                 QPointF p(floatData.at(instr.storeRealPair.valueIndex),
                           floatData.at(instr.storeRealPair.valueIndex+1));
                 void *a[] = { &p, 0, &status, &flags };
@@ -504,6 +552,8 @@ QObject *QDeclarativeVME::run(QDeclarativeVMEStack<QObject *> &stack,
         case QDeclarativeInstruction::StoreSize:
             {
                 QObject *target = stack.top();
+                CLEAN_PROPERTY(target, instr.storeRealPair.propertyIndex);
+
                 QSize p = QSizeF(floatData.at(instr.storeRealPair.valueIndex),
                                  floatData.at(instr.storeRealPair.valueIndex+1)).toSize();
                 void *a[] = { &p, 0, &status, &flags };
@@ -515,6 +565,8 @@ QObject *QDeclarativeVME::run(QDeclarativeVMEStack<QObject *> &stack,
         case QDeclarativeInstruction::StoreSizeF:
             {
                 QObject *target = stack.top();
+                CLEAN_PROPERTY(target, instr.storeRealPair.propertyIndex);
+
                 QSizeF s(floatData.at(instr.storeRealPair.valueIndex),
                          floatData.at(instr.storeRealPair.valueIndex+1));
                 void *a[] = { &s, 0, &status, &flags };
@@ -526,6 +578,8 @@ QObject *QDeclarativeVME::run(QDeclarativeVMEStack<QObject *> &stack,
         case QDeclarativeInstruction::StoreRect:
             {
                 QObject *target = stack.top();
+                CLEAN_PROPERTY(target, instr.storeRect.propertyIndex);
+
                 QRect r = QRectF(floatData.at(instr.storeRect.valueIndex),
                                  floatData.at(instr.storeRect.valueIndex+1),
                                  floatData.at(instr.storeRect.valueIndex+2),
@@ -539,6 +593,8 @@ QObject *QDeclarativeVME::run(QDeclarativeVMEStack<QObject *> &stack,
         case QDeclarativeInstruction::StoreRectF:
             {
                 QObject *target = stack.top();
+                CLEAN_PROPERTY(target, instr.storeRect.propertyIndex);
+
                 QRectF r(floatData.at(instr.storeRect.valueIndex),
                          floatData.at(instr.storeRect.valueIndex+1),
                          floatData.at(instr.storeRect.valueIndex+2),
@@ -552,6 +608,8 @@ QObject *QDeclarativeVME::run(QDeclarativeVMEStack<QObject *> &stack,
         case QDeclarativeInstruction::StoreVector3D:
             {
                 QObject *target = stack.top();
+                CLEAN_PROPERTY(target, instr.storeVector3D.propertyIndex);
+
                 QVector3D p(floatData.at(instr.storeVector3D.valueIndex),
                             floatData.at(instr.storeVector3D.valueIndex+1),
                             floatData.at(instr.storeVector3D.valueIndex+2));
@@ -565,6 +623,7 @@ QObject *QDeclarativeVME::run(QDeclarativeVMEStack<QObject *> &stack,
             {
                 QObject *assignObj = stack.pop();
                 QObject *target = stack.top();
+                CLEAN_PROPERTY(target, instr.storeObject.propertyIndex);
 
                 void *a[] = { (void *)&assignObj, 0, &status, &flags };
                 QMetaObject::metacall(target, QMetaObject::WriteProperty, 
@@ -576,6 +635,8 @@ QObject *QDeclarativeVME::run(QDeclarativeVMEStack<QObject *> &stack,
         case QDeclarativeInstruction::AssignCustomType:
             {
                 QObject *target = stack.top();
+                CLEAN_PROPERTY(target, instr.assignCustomType.propertyIndex);
+
                 QDeclarativeCompiledData::CustomTypeData data = customTypeData.at(instr.assignCustomType.valueIndex);
                 const QString &primitive = primitives.at(data.index);
                 QDeclarativeMetaType::StringConverter converter = 
@@ -780,6 +841,7 @@ QObject *QDeclarativeVME::run(QDeclarativeVMEStack<QObject *> &stack,
             {
                 QObject *assign = stack.pop();
                 QObject *target = stack.top();
+                CLEAN_PROPERTY(target, instr.storeObject.propertyIndex);
 
                 QVariant v = QVariant::fromValue(assign);
                 void *a[] = { &v, 0, &status, &flags };
@@ -792,6 +854,7 @@ QObject *QDeclarativeVME::run(QDeclarativeVMEStack<QObject *> &stack,
             {
                 QObject *assign = stack.pop();
                 QObject *target = stack.top();
+                CLEAN_PROPERTY(target, instr.storeObject.propertyIndex);
 
                 int coreIdx = instr.storeObject.propertyIndex;
                 QMetaProperty prop = target->metaObject()->property(coreIdx);