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

11 files changed, 98 insertions, 32 deletions

diff --git a/src/declarative/graphicsitems/qdeclarativegridview.cpp b/src/declarative/graphicsitems/qdeclarativegridview.cpp
index 5b313be..463b238 100644
--- a/src/declarative/graphicsitems/qdeclarativegridview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativegridview.cpp
@@ -52,8 +52,6 @@
 
 QT_BEGIN_NAMESPACE
 
-QHash<QObject*, QDeclarativeGridViewAttached*> QDeclarativeGridViewAttached::attachedProperties;
-
 
 //----------------------------------------------------------------------------
 
@@ -61,8 +59,9 @@ class FxGridItem
 {
 public:
     FxGridItem(QDeclarativeItem *i, QDeclarativeGridView *v) : item(i), view(v) {
-        attached = QDeclarativeGridViewAttached::properties(item);
-        attached->m_view = view;
+        attached = static_cast<QDeclarativeGridViewAttached*>(qmlAttachedPropertiesObject<QDeclarativeGridView>(item));
+        if (attached)
+            attached->m_view = view;
     }
     ~FxGridItem() {}
 
@@ -697,6 +696,11 @@ void QDeclarativeGridViewPrivate::updateCurrent(int modelIndex)
 
     In this case ListModel is a handy way for us to test our UI.  In practice
     the model would be implemented in C++, or perhaps via a SQL data source.
+
+    Note that views do not enable \e clip automatically.  If the view
+    is not clipped by another item or the screen, it will be necessary
+    to set \e {clip: true} in order to have the out of view items clipped
+    nicely.
 */
 QDeclarativeGridView::QDeclarativeGridView(QDeclarativeItem *parent)
     : QDeclarativeFlickable(*(new QDeclarativeGridViewPrivate), parent)
@@ -1336,6 +1340,18 @@ void QDeclarativeGridView::moveCurrentIndexRight()
     }
 }
 
+/*!
+    \qmlmethod GridView::positionViewAtIndex(int index)
+
+    Positions the view such that the \a index is at the top (or left for horizontal orientation) of the view.
+    If positioning the view at the index would cause empty space to be displayed at
+    the end of the view, the view will be positioned at the end.
+
+    It is not recommended to use contentX or contentY to position the view
+    at a particular index.  This is unreliable since removing items from the start
+    of the list does not cause all other items to be repositioned.
+    The correct way to bring an item into view is with positionViewAtIndex.
+*/
 void QDeclarativeGridView::positionViewAtIndex(int index)
 {
     Q_D(QDeclarativeGridView);
@@ -1743,7 +1759,7 @@ void QDeclarativeGridView::refill()
 
 QDeclarativeGridViewAttached *QDeclarativeGridView::qmlAttachedProperties(QObject *obj)
 {
-    return QDeclarativeGridViewAttached::properties(obj);
+    return new QDeclarativeGridViewAttached(obj);
 }
 
 QT_END_NAMESPACE
diff --git a/src/declarative/graphicsitems/qdeclarativegridview_p.h b/src/declarative/graphicsitems/qdeclarativegridview_p.h
index d463a46..22fcef6 100644
--- a/src/declarative/graphicsitems/qdeclarativegridview_p.h
+++ b/src/declarative/graphicsitems/qdeclarativegridview_p.h
@@ -167,9 +167,7 @@ class QDeclarativeGridViewAttached : public QObject
 public:
     QDeclarativeGridViewAttached(QObject *parent)
         : QObject(parent), m_isCurrent(false), m_delayRemove(false) {}
-    ~QDeclarativeGridViewAttached() {
-        attachedProperties.remove(parent());
-    }
+    ~QDeclarativeGridViewAttached() {}
 
     Q_PROPERTY(QDeclarativeGridView *view READ view CONSTANT)
     QDeclarativeGridView *view() { return m_view; }
@@ -192,15 +190,6 @@ public:
         }
     }
 
-    static QDeclarativeGridViewAttached *properties(QObject *obj) {
-        QDeclarativeGridViewAttached *rv = attachedProperties.value(obj);
-        if (!rv) {
-            rv = new QDeclarativeGridViewAttached(obj);
-            attachedProperties.insert(obj, rv);
-        }
-        return rv;
-    }
-
     void emitAdd() { emit add(); }
     void emitRemove() { emit remove(); }
 
@@ -212,10 +201,8 @@ Q_SIGNALS:
 
 public:
     QDeclarativeGridView *m_view;
-    bool m_isCurrent;
-    bool m_delayRemove;
-
-    static QHash<QObject*, QDeclarativeGridViewAttached*> attachedProperties;
+    bool m_isCurrent : 1;
+    bool m_delayRemove : 1;
 };
 
 
diff --git a/src/declarative/graphicsitems/qdeclarativelistview.cpp b/src/declarative/graphicsitems/qdeclarativelistview.cpp
index eb5315d..32627da 100644
--- a/src/declarative/graphicsitems/qdeclarativelistview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativelistview.cpp
@@ -1359,6 +1359,11 @@ void QDeclarativeListViewPrivate::flickY(qreal velocity)
 
     In this case ListModel is a handy way for us to test our UI.  In practice
     the model would be implemented in C++, or perhaps via a SQL data source.
+
+    Note that views do not enable \e clip automatically.  If the view
+    is not clipped by another item or the screen, it will be necessary
+    to set \e {clip: true} in order to have the out of view items clipped
+    nicely.
 */
 
 QDeclarativeListView::QDeclarativeListView(QDeclarativeItem *parent)
@@ -2281,6 +2286,12 @@ void QDeclarativeListView::decrementCurrentIndex()
     Positions the view such that the \a index is at the top (or left for horizontal orientation) of the view.
     If positioning the view at the index would cause empty space to be displayed at
     the end of the view, the view will be positioned at the end.
+
+    It is not recommended to use contentX or contentY to position the view
+    at a particular index.  This is unreliable since removing items from the start
+    of the list does not cause all other items to be repositioned, and because
+    the actual start of the view can vary based on the size of the delegates.
+    The correct way to bring an item into view is with positionViewAtIndex.
 */
 void QDeclarativeListView::positionViewAtIndex(int index)
 {
diff --git a/src/declarative/qml/qdeclarativecompiler.cpp b/src/declarative/qml/qdeclarativecompiler.cpp
index 1eea012..b07a85a 100644
--- a/src/declarative/qml/qdeclarativecompiler.cpp
+++ b/src/declarative/qml/qdeclarativecompiler.cpp
@@ -1792,7 +1792,7 @@ bool QDeclarativeCompiler::buildGroupedProperty(QDeclarativeParser::Property *pr
     if (prop->values.count())
         COMPILE_EXCEPTION(prop->values.first(), QCoreApplication::translate("QDeclarativeCompiler", "Invalid value in grouped property"));
 
-    if (prop->type < (int)QVariant::UserType) {
+    if (QDeclarativeValueTypeFactory::isValueType(prop->type)) {
         QDeclarativeEnginePrivate *ep =
             static_cast<QDeclarativeEnginePrivate *>(QObjectPrivate::get(engine));
         if (prop->type >= 0 /* QVariant == -1 */ && ep->valueTypes[prop->type]) {
diff --git a/src/declarative/qml/qdeclarativeenginedebug.cpp b/src/declarative/qml/qdeclarativeenginedebug.cpp
index 09882cb..3e4acbe 100644
--- a/src/declarative/qml/qdeclarativeenginedebug.cpp
+++ b/src/declarative/qml/qdeclarativeenginedebug.cpp
@@ -117,7 +117,7 @@ QDeclarativeEngineDebugServer::propertyData(QObject *obj, int propIdx)
     QVariant value = prop.read(obj);
     rv.value = valueContents(value);
 
-    if (QVariant::Type(prop.userType()) < QVariant::UserType) {
+    if (QDeclarativeValueTypeFactory::isValueType(prop.userType())) {
         rv.type = QDeclarativeObjectProperty::Basic;
     } else if (QDeclarativeMetaType::isQObject(prop.userType()))  {
         rv.type = QDeclarativeObjectProperty::Object;
@@ -131,7 +131,7 @@ QDeclarativeEngineDebugServer::propertyData(QObject *obj, int propIdx)
 QVariant QDeclarativeEngineDebugServer::valueContents(const QVariant &value) const
 {
     int userType = value.userType();
-    if (QVariant::Type(userType) < QVariant::UserType)
+    if (QDeclarativeValueTypeFactory::isValueType(userType))
         return value;
 
     /*
diff --git a/src/declarative/qml/qdeclarativeobjectscriptclass.cpp b/src/declarative/qml/qdeclarativeobjectscriptclass.cpp
index 542f417..2e4ffa7 100644
--- a/src/declarative/qml/qdeclarativeobjectscriptclass.cpp
+++ b/src/declarative/qml/qdeclarativeobjectscriptclass.cpp
@@ -232,7 +232,7 @@ QDeclarativeObjectScriptClass::property(QObject *obj, const Identifier &name)
                 QDeclarativeEnginePrivate::CapturedProperty(obj, lastData->coreIndex, lastData->notifyIndex);
         }
 
-        if ((uint)lastData->propType < QVariant::UserType) {
+        if (QDeclarativeValueTypeFactory::isValueType((uint)lastData->propType)) {
             QDeclarativeValueType *valueType = enginePriv->valueTypes[lastData->propType];
             if (valueType)
                 return Value(scriptEngine, enginePriv->valueTypeClass->newObject(obj, lastData->coreIndex, valueType));
diff --git a/src/declarative/qml/qdeclarativeproperty.cpp b/src/declarative/qml/qdeclarativeproperty.cpp
index 521c241..4f73b89 100644
--- a/src/declarative/qml/qdeclarativeproperty.cpp
+++ b/src/declarative/qml/qdeclarativeproperty.cpp
@@ -238,10 +238,10 @@ void QDeclarativePropertyPrivate::initProperty(QObject *obj, const QString &name
             if (property->flags & QDeclarativePropertyCache::Data::IsFunction) 
                 return; // Not an object property 
 
-            if (ii == (path.count() - 2) && property->propType < (int)QVariant::UserType) {
+            if (ii == (path.count() - 2) && QDeclarativeValueTypeFactory::isValueType(property->propType)) {
                 // We're now at a value type property.  We can use a global valuetypes array as we 
                 // never actually use the objects, just look up their properties.
-                QObject *typeObject = qmlValueTypes()->valueTypes[property->propType];
+                QObject *typeObject = (*qmlValueTypes())[property->propType];
                 if (!typeObject) return; // Not a value type
 
                 int idx = typeObject->metaObject()->indexOfProperty(path.last().toUtf8().constData());
@@ -346,7 +346,7 @@ QDeclarativePropertyPrivate::propertyTypeCategory() const
         int type = propertyType();
         if (type == QVariant::Invalid)
             return QDeclarativeProperty::InvalidCategory;
-        else if ((uint)type < QVariant::UserType)
+        else if (QDeclarativeValueTypeFactory::isValueType((uint)type))
             return QDeclarativeProperty::Normal;
         else if (core.flags & QDeclarativePropertyCache::Data::IsQObjectDerived)
             return QDeclarativeProperty::Object;
diff --git a/src/declarative/qml/qdeclarativevaluetype.cpp b/src/declarative/qml/qdeclarativevaluetype.cpp
index 01fa214..34d3795 100644
--- a/src/declarative/qml/qdeclarativevaluetype.cpp
+++ b/src/declarative/qml/qdeclarativevaluetype.cpp
@@ -45,19 +45,50 @@
 
 QT_BEGIN_NAMESPACE
 
+#if (QT_VERSION < QT_VERSION_CHECK(4,7,0))
+Q_DECLARE_METATYPE(QEasingCurve);
+#endif
+
 QDeclarativeValueTypeFactory::QDeclarativeValueTypeFactory()
 {
     // ### Optimize
     for (unsigned int ii = 0; ii < (QVariant::UserType - 1); ++ii)
         valueTypes[ii] = valueType(ii);
+#if (QT_VERSION < QT_VERSION_CHECK(4,7,0))
+    easingType = qMetaTypeId<QEasingCurve>();
+    easingValueType = valueType(easingType);
+#endif
 }
 
 QDeclarativeValueTypeFactory::~QDeclarativeValueTypeFactory()
 {
     for (unsigned int ii = 0; ii < (QVariant::UserType - 1); ++ii)
         delete valueTypes[ii];
+#if (QT_VERSION < QT_VERSION_CHECK(4,7,0))
+    delete easingValueType;
+#endif
+}
+
+bool QDeclarativeValueTypeFactory::isValueType(int idx)
+{
+    if ((uint)idx < QVariant::UserType)
+        return true;
+#if (QT_VERSION < QT_VERSION_CHECK(4,7,0))
+    if (idx == qMetaTypeId<QEasingCurve>())
+        return true;
+#endif
+    return false;
 }
 
+QDeclarativeValueType *QDeclarativeValueTypeFactory::operator[](int idx) const
+{
+#if (QT_VERSION < QT_VERSION_CHECK(4,7,0))
+    if (idx == easingType) return easingValueType;
+#endif
+    return valueTypes[idx];
+}
+
+
 QDeclarativeValueType *QDeclarativeValueTypeFactory::valueType(int t)
 {
     switch (t) {
@@ -75,11 +106,17 @@ QDeclarativeValueType *QDeclarativeValueTypeFactory::valueType(int t)
         return new QDeclarativeRectFValueType;
     case QVariant::Vector3D:
         return new QDeclarativeVector3DValueType;
+#if (QT_VERSION >= QT_VERSION_CHECK(4,7,0))
     case QVariant::EasingCurve:
         return new QDeclarativeEasingValueType;
+#endif
     case QVariant::Font:
         return new QDeclarativeFontValueType;
     default:
+#if (QT_VERSION < QT_VERSION_CHECK(4,7,0))
+        if (t == qMetaTypeId<QEasingCurve>())
+            return new QDeclarativeEasingValueType;
+#endif
         return 0;
     }
 }
@@ -495,7 +532,11 @@ void QDeclarativeEasingValueType::write(QObject *obj, int idx, QDeclarativePrope
 
 QVariant QDeclarativeEasingValueType::value()
 {
+#if (QT_VERSION >= QT_VERSION_CHECK(4,7,0))
     return QVariant(easing);
+#else
+    return QVariant::fromValue<QEasingCurve>(easing);
+#endif
 }
 
 void QDeclarativeEasingValueType::setValue(QVariant value)
diff --git a/src/declarative/qml/qdeclarativevaluetype_p.h b/src/declarative/qml/qdeclarativevaluetype_p.h
index cb153be..e69f161 100644
--- a/src/declarative/qml/qdeclarativevaluetype_p.h
+++ b/src/declarative/qml/qdeclarativevaluetype_p.h
@@ -81,10 +81,17 @@ class Q_DECLARATIVE_EXPORT QDeclarativeValueTypeFactory
 public:
     QDeclarativeValueTypeFactory();
     ~QDeclarativeValueTypeFactory();
+    static bool isValueType(int);
     static QDeclarativeValueType *valueType(int);
 
+    QDeclarativeValueType *operator[](int idx) const;
+
+private:
     QDeclarativeValueType *valueTypes[QVariant::UserType - 1]; 
-    QDeclarativeValueType *operator[](int idx) const { return valueTypes[idx]; }
+#if (QT_VERSION < QT_VERSION_CHECK(4,7,0))
+    int easingType;
+    QDeclarativeValueType *easingValueType;
+#endif
 };
 
 class Q_AUTOTEST_EXPORT QDeclarativePointFValueType : public QDeclarativeValueType
diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/declarative/util/qdeclarativeanimation.cpp
index b14de19..f33d7c7 100644
--- a/src/declarative/util/qdeclarativeanimation.cpp
+++ b/src/declarative/util/qdeclarativeanimation.cpp
@@ -52,6 +52,7 @@
 #include <qdeclarativestringconverters_p.h>
 #include <qdeclarativeglobal_p.h>
 #include <qdeclarativemetatype_p.h>
+#include <qdeclarativevaluetype_p.h>
 #include <qdeclarativeproperty_p.h>
 
 #include <qvariant.h>
@@ -1710,12 +1711,13 @@ void QDeclarativePropertyAnimationPrivate::convertVariant(QVariant &variant, int
         break;
     }
     default:
-        if ((uint)type >= QVariant::UserType) {
+        if (QDeclarativeValueTypeFactory::isValueType((uint)type)) {
+            variant.convert((QVariant::Type)type);
+        } else {
             QDeclarativeMetaType::StringConverter converter = QDeclarativeMetaType::customStringConverter(type);
             if (converter)
                 variant = converter(variant.toString());
-        } else
-            variant.convert((QVariant::Type)type);
+        }
         break;
     }
 }
diff --git a/src/declarative/util/qdeclarativeview.cpp b/src/declarative/util/qdeclarativeview.cpp
index f08e634..cd67aeb 100644
--- a/src/declarative/util/qdeclarativeview.cpp
+++ b/src/declarative/util/qdeclarativeview.cpp
@@ -194,6 +194,7 @@ void QDeclarativeViewPrivate::execute()
     \o Initializes QGraphicsView for QML key handling:
         \list
         \o QGraphicsView::viewport()->setFocusPolicy(Qt::NoFocus);
+        \o QGraphicsView::setFocusPolicy(Qt::StrongFocus);
         \o QGraphicsScene::setStickyFocus(true);
         \endlist
     \endlist
@@ -268,6 +269,7 @@ void QDeclarativeViewPrivate::init()
     q->setViewportUpdateMode(QGraphicsView::BoundingRectViewportUpdate);
     scene.setItemIndexMethod(QGraphicsScene::NoIndex);
     q->viewport()->setFocusPolicy(Qt::NoFocus);
+    q->setFocusPolicy(Qt::StrongFocus);
 
     scene.setStickyFocus(true);  //### needed for correct focus handling
 }