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

3 files changed, 7 insertions, 7 deletions

diff --git a/src/declarative/fx/qfxpathview.cpp b/src/declarative/fx/qfxpathview.cpp
index 2b39d6e..77d5fa2 100644
--- a/src/declarative/fx/qfxpathview.cpp
+++ b/src/declarative/fx/qfxpathview.cpp
@@ -157,7 +157,6 @@ void QFxPathView::setModel(const QVariant &model)
         disconnect(d->model, SIGNAL(itemCreated(int, QFxItem*)), this, SLOT(itemCreated(int,QFxItem*)));
         for (int i=0; i<d->items.count(); i++){
             QFxItem *p = d->items[i];
-            attachedProperties.remove(p);
             d->model->release(p);
         }
         d->items.clear();
@@ -557,7 +556,6 @@ void QFxPathViewPrivate::regenerate()
     Q_Q(QFxPathView);
     for (int i=0; i<items.count(); i++){
         QFxItem *p = items[i];
-        q->attachedProperties.remove(p);
         model->release(p);
     }
     items.clear();
@@ -631,7 +629,6 @@ void QFxPathView::refill()
             while(wrapIndex-- >= 0){
                 QFxItem* p = d->items.takeFirst();
                 d->updateItem(p, 0.0);
-                attachedProperties.remove(p);
                 d->model->release(p);
                 d->firstIndex++;
                 d->firstIndex %= d->model->count();
@@ -645,7 +642,6 @@ void QFxPathView::refill()
             while(wrapIndex++ < d->items.count()-1){
                 QFxItem* p = d->items.takeLast();
                 d->updateItem(p, 1.0);
-                attachedProperties.remove(p);
                 d->model->release(p);
                 d->firstIndex--;
                 if (d->firstIndex < 0)
@@ -704,7 +700,6 @@ void QFxPathView::itemsRemoved(int modelIndex, int count)
     if (d->pathItems == -1) {
         for (int i = 0; i < count; ++i) {
             QFxItem* p = d->items.takeAt(modelIndex);
-            attachedProperties.remove(p);
             d->model->release(p);
         }
         d->snapToCurrent();
@@ -876,8 +871,11 @@ void QFxPathViewPrivate::snapToCurrent()
 QHash<QObject*, QObject*> QFxPathView::attachedProperties;
 QObject *QFxPathView::qmlAttachedProperties(QObject *obj)
 {
-    QFxPathViewAttached *rv = new QFxPathViewAttached(obj);
-    attachedProperties.insert(obj, rv);
+    QObject *rv = attachedProperties.value(obj);
+    if (!rv) {
+        rv = new QFxPathViewAttached(obj);
+        attachedProperties.insert(obj, rv);
+    }
     return rv;
 }
 
diff --git a/src/declarative/qml/script/qmlbasicscript.cpp b/src/declarative/qml/script/qmlbasicscript.cpp
index 603e6ba..ee537e4 100644
--- a/src/declarative/qml/script/qmlbasicscript.cpp
+++ b/src/declarative/qml/script/qmlbasicscript.cpp
@@ -789,6 +789,7 @@ QVariant QmlBasicScript::run(QmlContext *context, void *voidCache, CacheState *c
                         state = Incremental;
                     }
 
+                    qWarning("ReferenceError: %s is not defined", id);
                 } else { // instr.type == ScriptInstruction::Fetch
 
                     QVariant o = stack.pop();
diff --git a/src/declarative/qml/script/qmlbasicscript_p.h b/src/declarative/qml/script/qmlbasicscript_p.h
index bcb7d00..fb9951e 100644
--- a/src/declarative/qml/script/qmlbasicscript_p.h
+++ b/src/declarative/qml/script/qmlbasicscript_p.h
@@ -39,6 +39,7 @@ public:
     };
     int coreType;
 
+    bool isValid() const { return type != Invalid; }
     bool isCore() const { return type == Core; }
     bool isExplicit() const { return type == Explicit; }
     void clear();