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

Conflicts:
	src/declarative/qml/qmlcomponentjs.cpp
	src/declarative/qml/qmlcomponentjs_p.h
	src/declarative/qml/qmlcomponentjs_p_p.h

3 files changed, 7 insertions, 7 deletions

diff --git a/src/declarative/extra/qfxanimatedimageitem.cpp b/src/declarative/extra/qfxanimatedimageitem.cpp
index a0ebd66..2e6688e 100644
--- a/src/declarative/extra/qfxanimatedimageitem.cpp
+++ b/src/declarative/extra/qfxanimatedimageitem.cpp
@@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE
 */
 
 /*!
-    \qmlclass AnimatedImage
+    \qmlclass AnimatedImage QFxAnimatedImageItem
     \inherits Image
 
     This item provides for playing animations stored as images containing a series of frames,
diff --git a/src/declarative/extra/qfxparticles.cpp b/src/declarative/extra/qfxparticles.cpp
index bf25671..aaeed84 100644
--- a/src/declarative/extra/qfxparticles.cpp
+++ b/src/declarative/extra/qfxparticles.cpp
@@ -359,7 +359,6 @@ public:
     qreal minX;
     qreal maxY;
     qreal minY;
-    QVarLengthArray<QDrawPixmaps::Data, 50> pixmapData;
     QFxParticlesPrivate* d;
 };
 
@@ -384,7 +383,6 @@ public:
     {
         Q_Q(QFxParticles);
         paintItem = new QFxParticlesPainter(this, q);
-        paintItem->pixmapData.resize(count);
     }
 
     void tick(int time);
@@ -702,8 +700,6 @@ void QFxParticles::setCount(int cnt)
 
     int oldCount = d->count;
     d->count = cnt;
-    if (cnt > oldCount)
-        d->paintItem->pixmapData.resize(d->count);
     d->addParticleTime = 0;
     d->addParticleCount = d->particles.count();
     if (!oldCount && d->clock.state() != QAbstractAnimation::Running && d->count) {
@@ -1104,6 +1100,10 @@ void QFxParticlesPainter::paint(QPainter *p, const QStyleOptionGraphicsItem *, Q
     const int myX = x() + parentItem()->x();
     const int myY = y() + parentItem()->y();
 
+    static QVarLengthArray<QDrawPixmaps::Data, 256> pixmapData;
+    if (pixmapData.count() < d->particles.count())
+        pixmapData.resize(d->particles.count());
+
     const QRectF sourceRect = d->image.rect();
     for (int i = 0; i < d->particles.count(); ++i) {
         const QFxParticle &particle = d->particles.at(i);
diff --git a/src/declarative/extra/qmlxmllistmodel.cpp b/src/declarative/extra/qmlxmllistmodel.cpp
index 6a5ddea..062a2a4 100644
--- a/src/declarative/extra/qmlxmllistmodel.cpp
+++ b/src/declarative/extra/qmlxmllistmodel.cpp
@@ -62,7 +62,7 @@ QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,XmlRole,QmlXmlListModelRole)
 QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,XmlListModel,QmlXmlListModel)
 
 /*!
-    \qmlclass XmlRole
+    \qmlclass XmlRole QmlXmlListModelRole
     \brief The XmlRole element allows you to specify a role for an XmlListModel.
 */
 
@@ -411,7 +411,7 @@ void QmlXmlRoleList::insert(int i, QmlXmlListModelRole *role)
 */
 
 /*!
-    \qmlclass XmlListModel
+    \qmlclass XmlListModel QmlXmlListModel
     \brief The XmlListModel element allows you to specify a model using XPath expressions.
 
     XmlListModel allows you to construct a model from XML data that can then be used as a data source