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

16 files changed, 49 insertions, 40 deletions

diff --git a/src/declarative/fx/qfxeffects.cpp b/src/declarative/fx/qfxeffects.cpp
index 0ffe07c..8467dd7 100644
--- a/src/declarative/fx/qfxeffects.cpp
+++ b/src/declarative/fx/qfxeffects.cpp
@@ -49,7 +49,7 @@ QML_DECLARE_TYPE(QGraphicsBlurEffect)
 QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,Blur,QGraphicsBlurEffect)
 
 /*!
-    \qmlclass Blur
+    \qmlclass Blur QGraphicsBlurEffect
     \brief The Blur object provides a blur effect.
 
     A blur effect blurs the source item. This effect is useful for reducing details,
@@ -86,7 +86,7 @@ QML_DECLARE_TYPE(QGraphicsGrayscaleEffect)
 QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,Grayscale,QGraphicsGrayscaleEffect)
 
 /*!
-    \qmlclass Grayscale
+    \qmlclass Grayscale QGraphicsGrayscaleEffect
     \brief The Grayscale object provides a grayscale effect.
 
     A grayscale effect renders the source item in shades of gray.
@@ -105,7 +105,7 @@ QML_DECLARE_TYPE(QGraphicsColorizeEffect)
 QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,Colorize,QGraphicsColorizeEffect)
 
 /*!
-    \qmlclass Colorize
+    \qmlclass Colorize QGraphicsColorizeEffect
     \brief The Colorize object provides a colorize effect.
 
     A colorize effect renders the source item with a tint of its color.
@@ -133,7 +133,7 @@ QML_DECLARE_TYPE(QGraphicsPixelizeEffect)
 QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,Pixelize,QGraphicsPixelizeEffect)
 
 /*!
-    \qmlclass Pixelize
+    \qmlclass Pixelize QGraphicsPixelizeEffect
     \brief The Pixelize object provides a pixelize effect.
 
     A pixelize effect renders the source item in lower resolution. The resolution
@@ -159,7 +159,7 @@ QML_DECLARE_TYPE(QGraphicsDropShadowEffect)
 QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,DropShadow,QGraphicsDropShadowEffect)
 
 /*!
-    \qmlclass DropShadow
+    \qmlclass DropShadow QGraphicsDropShadowEffect
     \brief The DropShadow object provides a drop shadow effect.
 
     A drop shadow effect renders the source item with a drop shadow. The color of
@@ -202,7 +202,7 @@ QML_DECLARE_TYPE(QGraphicsOpacityEffect)
 QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,Opacity,QGraphicsOpacityEffect)
 
 /*!
-    \qmlclass Opacity
+    \qmlclass Opacity QGraphicsOpacityEffect
     \brief The Opacity object provides an opacity effect.
 
     An opacity effect renders the source with an opacity. This effect is useful
@@ -228,7 +228,7 @@ QML_DECLARE_TYPE(QGraphicsBloomEffect)
 QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,Bloom,QGraphicsBloomEffect)
 
 /*!
-    \qmlclass Bloom
+    \qmlclass Bloom QGraphicsBloomEffect
     \brief The Bloom object provides a bloom/glow effect.
 
     A bloom/glow effect adds fringes of light around bright areas in the source item.
diff --git a/src/declarative/fx/qfxflickable.cpp b/src/declarative/fx/qfxflickable.cpp
index bf5e1bb..f1ab44f 100644
--- a/src/declarative/fx/qfxflickable.cpp
+++ b/src/declarative/fx/qfxflickable.cpp
@@ -344,7 +344,7 @@ void QFxFlickablePrivate::updateBeginningEnd()
 QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,Flickable,QFxFlickable)
 
 /*!
-    \qmlclass Flickable
+    \qmlclass Flickable QFxFlickable
     \brief The Flickable item provides a surface that can be "flicked".
     \inherits Item
 
diff --git a/src/declarative/fx/qfxfocuspanel.cpp b/src/declarative/fx/qfxfocuspanel.cpp
index 15ba804..959f9c3 100644
--- a/src/declarative/fx/qfxfocuspanel.cpp
+++ b/src/declarative/fx/qfxfocuspanel.cpp
@@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE
 QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,FocusPanel,QFxFocusPanel)
 
 /*!
-   \qmlclass FocusPanel
+   \qmlclass FocusPanel QFxFocusPanel
    \brief The FocusPanel item explicitly creates a focus panel.
    \inherits Item
 
diff --git a/src/declarative/fx/qfxfocusscope.cpp b/src/declarative/fx/qfxfocusscope.cpp
index 2ca43b9..d52d03d 100644
--- a/src/declarative/fx/qfxfocusscope.cpp
+++ b/src/declarative/fx/qfxfocusscope.cpp
@@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE
 QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,FocusScope,QFxFocusScope)
 
 /*!
-    \qmlclass FocusScope
+    \qmlclass FocusScope QFxFocusScope
     \brief The FocusScope object explicitly creates a focus scope.
     \inherits Item
 
diff --git a/src/declarative/fx/qfxgridview.cpp b/src/declarative/fx/qfxgridview.cpp
index dea06bf..032c2b1 100644
--- a/src/declarative/fx/qfxgridview.cpp
+++ b/src/declarative/fx/qfxgridview.cpp
@@ -658,7 +658,7 @@ void QFxGridViewPrivate::updateCurrent(int modelIndex)
 //----------------------------------------------------------------------------
 
 /*!
-    \qmlclass GridView
+    \qmlclass GridView QFxGridView
     \inherits Flickable
     \brief The GridView item provides a grid view of items provided by a model.
 
diff --git a/src/declarative/fx/qfxitem.cpp b/src/declarative/fx/qfxitem.cpp
index 88dac8d..06cc654 100644
--- a/src/declarative/fx/qfxitem.cpp
+++ b/src/declarative/fx/qfxitem.cpp
@@ -79,7 +79,7 @@ QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,Rotation,QGraphicsRotation)
 #include "qfxeffects.cpp"
 
 /*!
-    \qmlclass Transform
+    \qmlclass Transform QGraphicsTransform
     \brief The Transform elements provide a way of building advanced transformations on Items.
 
     The Transform elements let you create and control advanced transformations that can be configured
@@ -92,7 +92,7 @@ QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,Rotation,QGraphicsRotation)
 */
 
 /*!
-    \qmlclass Scale
+    \qmlclass Scale QGraphicsScale
     \brief The Scale object provides a way to scale an Item.
 
     The Scale object gives more control over scaling than using Item's scale property. Specifically,
@@ -130,7 +130,7 @@ QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,Rotation,QGraphicsRotation)
 */
 
 /*!
-    \qmlclass Rotation
+    \qmlclass Rotation QGraphicsRotation
     \brief The Rotation object provides a way to rotate an Item.
 
     The Rotation object gives more control over rotation than using Item's rotation property.
diff --git a/src/declarative/fx/qfxlistview.cpp b/src/declarative/fx/qfxlistview.cpp
index b959594..4928ef4 100644
--- a/src/declarative/fx/qfxlistview.cpp
+++ b/src/declarative/fx/qfxlistview.cpp
@@ -954,7 +954,7 @@ void QFxListViewPrivate::flickY(qreal velocity)
 //----------------------------------------------------------------------------
 
 /*!
-    \qmlclass ListView
+    \qmlclass ListView QFxListView
     \inherits Flickable
     \brief The ListView item provides a list view of items provided by a model.
 
@@ -1679,37 +1679,46 @@ void QFxListView::trackedPositionChanged()
         return;
     if (!isFlicking() && !d->moving && d->moveReason != QFxListViewPrivate::Mouse) {
         const qreal trackedPos = d->trackedItem->position();
+        const qreal viewPos = d->position();
         if (d->haveHighlightRange) {
             if (d->highlightRange == StrictlyEnforceRange) {
-                qreal pos = d->position();
+                qreal pos = viewPos;
                 if (trackedPos > pos + d->highlightRangeEnd - d->trackedItem->size())
                     pos = trackedPos - d->highlightRangeEnd + d->trackedItem->size();
                 if (trackedPos < pos + d->highlightRangeStart)
                     pos = trackedPos - d->highlightRangeStart;
                 d->setPosition(pos);
             } else {
-                qreal pos = d->position();
+                qreal pos = viewPos;
                 if (trackedPos < d->startPosition() + d->highlightRangeStart) {
                     pos = d->startPosition();
                 } else if (d->trackedItem->endPosition() > d->endPosition() - d->size() + d->highlightRangeEnd) {
                     pos = d->endPosition() - d->size();
                 } else {
-                    if (trackedPos < d->position() + d->highlightRangeStart) {
+                    if (trackedPos < viewPos + d->highlightRangeStart) {
                         pos = trackedPos - d->highlightRangeStart;
-                    } else if (trackedPos > d->position() + d->highlightRangeEnd - d->trackedItem->size()) {
+                    } else if (trackedPos > viewPos + d->highlightRangeEnd - d->trackedItem->size()) {
                         pos = trackedPos - d->highlightRangeEnd + d->trackedItem->size();
                     }
                 }
                 d->setPosition(pos);
             }
         } else {
-            if (trackedPos < d->position()) {
-                d->setPosition(trackedPos);
+            if (trackedPos < viewPos && d->currentItem->position() < viewPos) {
+                d->setPosition(d->currentItem->position() < trackedPos ? trackedPos : d->currentItem->position());
                 d->fixupPosition();
-            } else if (d->trackedItem->endPosition() > d->position() + d->size()) {
-                qreal pos = d->trackedItem->endPosition() - d->size();
-                if (d->trackedItem->size() > d->size())
-                    pos = trackedPos;
+            } else if (d->trackedItem->endPosition() > viewPos + d->size()
+                        && d->currentItem->endPosition() > viewPos + d->size()) {
+                qreal pos;
+                if (d->trackedItem->endPosition() < d->currentItem->endPosition()) {
+                    pos = d->trackedItem->endPosition() - d->size();
+                    if (d->trackedItem->size() > d->size())
+                        pos = trackedPos;
+                } else {
+                    pos = d->currentItem->endPosition() - d->size();
+                    if (d->currentItem->size() > d->size())
+                        pos = d->currentItem->position();
+                }
                 d->setPosition(pos);
                 d->fixupPosition();
             }
diff --git a/src/declarative/fx/qfxloader.cpp b/src/declarative/fx/qfxloader.cpp
index b0d0e78..9bc08c0 100644
--- a/src/declarative/fx/qfxloader.cpp
+++ b/src/declarative/fx/qfxloader.cpp
@@ -56,7 +56,7 @@ QFxLoaderPrivate::~QFxLoaderPrivate()
 QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,Loader,QFxLoader)
 
 /*!
-    \qmlclass Loader
+    \qmlclass Loader QFxLoader
     \inherits Item
 
     \brief The Loader item allows dynamically loading an Item-based
diff --git a/src/declarative/fx/qfxmouseregion.cpp b/src/declarative/fx/qfxmouseregion.cpp
index f8f9f7e..7f37a83 100644
--- a/src/declarative/fx/qfxmouseregion.cpp
+++ b/src/declarative/fx/qfxmouseregion.cpp
@@ -120,7 +120,7 @@ void QFxDrag::setYmax(qreal m)
 }
 
 /*!
-    \qmlclass MouseRegion
+    \qmlclass MouseRegion QFxMouseRegion
     \brief The MouseRegion item enables simple mouse handling.
     \inherits Item
 
diff --git a/src/declarative/fx/qfxpath.cpp b/src/declarative/fx/qfxpath.cpp
index fbc716d..6ac2ea0 100644
--- a/src/declarative/fx/qfxpath.cpp
+++ b/src/declarative/fx/qfxpath.cpp
@@ -57,7 +57,7 @@ QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,PathQuad,QFxPathQuad)
 QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,PathCubic,QFxPathCubic)
 
 /*!
-    \qmlclass PathElement
+    \qmlclass PathElement QFxPathElement
     \brief PathElement is the base path type.
 
     This type is the base for all path types.  It cannot
@@ -464,7 +464,7 @@ void QFxCurve::setY(qreal y)
 /****************************************************************************/
 
 /*!
-    \qmlclass PathAttribute
+    \qmlclass PathAttribute QFxPathAttribute
     \brief The PathAttribute allows setting an attribute at a given position in a Path.
 
     The PathAttribute object allows attibutes consisting of a name and
@@ -543,7 +543,7 @@ void QFxPathAttribute::setValue(qreal value)
 /****************************************************************************/
 
 /*!
-    \qmlclass PathLine
+    \qmlclass PathLine QFxPathLine
     \brief The PathLine defines a straight line.
 
     The example below creates a path consisting of a straight line from
@@ -583,7 +583,7 @@ void QFxPathLine::addToPath(QPainterPath &path)
 /****************************************************************************/
 
 /*!
-    \qmlclass PathQuad
+    \qmlclass PathQuad QFxPathQuad
     \brief The PathQuad defines a quadratic Bezier curve with a control point.
 
     The following QML produces the path shown below:
@@ -667,7 +667,7 @@ void QFxPathQuad::addToPath(QPainterPath &path)
 /****************************************************************************/
 
 /*!
-   \qmlclass PathCubic
+   \qmlclass PathCubic QFxPathCubic
    \brief The PathCubic defines a cubic Bezier curve with two control points.
 
     The following QML produces the path shown below:
@@ -777,7 +777,7 @@ void QFxPathCubic::addToPath(QPainterPath &path)
 /****************************************************************************/
 
 /*!
-    \qmlclass PathPercent
+    \qmlclass PathPercent QFxPathPercent
     \brief The PathPercent manipulates the way a path is interpreted.
 
     The examples below show the normal distrubution of items along a path
diff --git a/src/declarative/fx/qfxpathview.cpp b/src/declarative/fx/qfxpathview.cpp
index bb52813..fed88cd 100644
--- a/src/declarative/fx/qfxpathview.cpp
+++ b/src/declarative/fx/qfxpathview.cpp
@@ -97,7 +97,7 @@ private:
 */
 
 /*!
-    \qmlclass PathView
+    \qmlclass PathView QFxPathView
     \brief The PathView element lays out model-provided items on a path.
     \inherits Item
 
diff --git a/src/declarative/fx/qfxpositioners.cpp b/src/declarative/fx/qfxpositioners.cpp
index 3dac816..1085ca0 100644
--- a/src/declarative/fx/qfxpositioners.cpp
+++ b/src/declarative/fx/qfxpositioners.cpp
@@ -333,7 +333,7 @@ void QFxBasePositioner::applyRemove(const QList<QPair<QString, QVariant> >& chan
 
 QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,Column,QFxColumn)
 /*!
-  \qmlclass Column
+  \qmlclass Column QFxColumn
   \brief The Column item lines up its children vertically.
   \inherits Item
 
@@ -519,7 +519,7 @@ void QFxColumn::doPositioning()
 
 QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,Row,QFxRow)
 /*!
-  \qmlclass Row
+  \qmlclass Row QFxRow
   \brief The Row item lines up its children horizontally.
   \inherits Item
 
diff --git a/src/declarative/fx/qfxrepeater.cpp b/src/declarative/fx/qfxrepeater.cpp
index 9b833ef..657da55 100644
--- a/src/declarative/fx/qfxrepeater.cpp
+++ b/src/declarative/fx/qfxrepeater.cpp
@@ -59,7 +59,7 @@ QFxRepeaterPrivate::~QFxRepeaterPrivate()
 QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,Repeater,QFxRepeater)
 
 /*!
-    \qmlclass Repeater
+    \qmlclass Repeater QFxRepeater
     \inherits Item
 
     \brief The Repeater item allows you to repeat a component based on a model.
diff --git a/src/declarative/fx/qfxtextedit.cpp b/src/declarative/fx/qfxtextedit.cpp
index 85fd525..b7b8b54 100644
--- a/src/declarative/fx/qfxtextedit.cpp
+++ b/src/declarative/fx/qfxtextedit.cpp
@@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE
 QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,TextEdit,QFxTextEdit)
 
 /*!
-    \qmlclass TextEdit
+    \qmlclass TextEdit QFxTextEdit
     \brief The TextEdit item allows you to add editable formatted text to a scene.
 
     It can display both plain and rich text. For example:
diff --git a/src/declarative/fx/qfxtextinput.cpp b/src/declarative/fx/qfxtextinput.cpp
index a99774f..d23fa04 100644
--- a/src/declarative/fx/qfxtextinput.cpp
+++ b/src/declarative/fx/qfxtextinput.cpp
@@ -54,7 +54,7 @@ QML_DEFINE_NOCREATE_TYPE(QValidator);
 QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,QIntValidator,QIntValidator);
 
 /*!
-    \qmlclass TextInput
+    \qmlclass TextInput QFxTextInput
     The TextInput item allows you to add an editable line of text to a scene.
 
     TextInput can only display a single line of text, and can only display
diff --git a/src/declarative/fx/qfxwebview.cpp b/src/declarative/fx/qfxwebview.cpp
index 2652eda..b465c7e 100644
--- a/src/declarative/fx/qfxwebview.cpp
+++ b/src/declarative/fx/qfxwebview.cpp
@@ -208,7 +208,7 @@ public:
 };
 
 /*!
-    \qmlclass WebView
+    \qmlclass WebView QFxWebView
     \brief The WebView item allows you to add web content to a canvas.
     \inherits Item