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

14 files changed, 80 insertions, 149 deletions

diff --git a/src/declarative/3rdparty/qlistmodelinterface.cpp b/src/declarative/3rdparty/qlistmodelinterface.cpp
index 75960a1..4213ff2 100644
--- a/src/declarative/3rdparty/qlistmodelinterface.cpp
+++ b/src/declarative/3rdparty/qlistmodelinterface.cpp
@@ -44,6 +44,7 @@
 QT_BEGIN_NAMESPACE
 
 /*!
+  \internal
   \class QListModelInterface
   \brief The QListModelInterface class can be subclassed to provide C++ models to QFx Views
 
diff --git a/src/declarative/fx/qfxgridview.cpp b/src/declarative/fx/qfxgridview.cpp
index 6c5a712..28f2219 100644
--- a/src/declarative/fx/qfxgridview.cpp
+++ b/src/declarative/fx/qfxgridview.cpp
@@ -1028,18 +1028,12 @@ void QFxGridView::sizeChange()
     }
 }
 
-/*!
-  \reimp
-*/
 void QFxGridView::viewportMoved()
 {
     QFxFlickable::viewportMoved();
     refill();
 }
 
-/*!
-  \reimp
-*/
 qreal QFxGridView::minYExtent() const
 {
     Q_D(const QFxGridView);
@@ -1048,9 +1042,6 @@ qreal QFxGridView::minYExtent() const
     return -d->startPosition();
 }
 
-/*!
-  \reimp
-*/
 qreal QFxGridView::maxYExtent() const
 {
     Q_D(const QFxGridView);
@@ -1059,9 +1050,6 @@ qreal QFxGridView::maxYExtent() const
     return -(d->endPosition() - height());
 }
 
-/*!
-  \reimp
-*/
 qreal QFxGridView::minXExtent() const
 {
     Q_D(const QFxGridView);
@@ -1070,9 +1058,6 @@ qreal QFxGridView::minXExtent() const
     return -d->startPosition();
 }
 
-/*!
-  \reimp
-*/
 qreal QFxGridView::maxXExtent() const
 {
     Q_D(const QFxGridView);
@@ -1081,9 +1066,6 @@ qreal QFxGridView::maxXExtent() const
     return -(d->endPosition() - height());
 }
 
-/*!
-  \reimp
-*/
 void QFxGridView::keyPressEvent(QKeyEvent *event)
 {
     Q_D(QFxGridView);
@@ -1131,9 +1113,6 @@ void QFxGridView::keyPressEvent(QKeyEvent *event)
     QFxFlickable::keyPressEvent(event);
 }
 
-/*!
-  \reimp
-*/
 void QFxGridView::componentComplete()
 {
     Q_D(QFxGridView);
diff --git a/src/declarative/fx/qfxitem.cpp b/src/declarative/fx/qfxitem.cpp
index cca21b9..4ec0a85 100644
--- a/src/declarative/fx/qfxitem.cpp
+++ b/src/declarative/fx/qfxitem.cpp
@@ -893,18 +893,6 @@ QFxKeysAttached *QFxKeysAttached::qmlAttachedProperties(QObject *obj)
 */
 
 /*!
-    \fn void QFxItem::hcenterChanged()
-
-    This signal is emitted when the horizontal center coordinate of the item changes.
-*/
-
-/*!
-    \fn void QFxItem::vcenterChanged()
-
-    This signal is emitted when the vertical center coordinate of the item changes.
-*/
-
-/*!
     \fn void QFxItem::stateChanged(const QString &state)
 
     This signal is emitted when the \a state of the item changes.
@@ -1334,27 +1322,6 @@ void QFxItem::setClip(bool c)
  */
 
 /*!
-  \property QFxItem::x
-
-  The x coordinate of the item relative to its parent.
-*/
-
-/*!
-  \property QFxItem::y
-
-  The y coordinate of the item relative to its parent.
-*/
-
-/*!
-  \property QFxItem::z
-
-  The z coordinate of the item relative to its parent.
-
-  A negative z coordinate means the item will be painted below its parent.
-*/
-
-
-/*!
   \qmlproperty real Item::z
 
   Sets the stacking order of the item.  By default the stacking order is 0.
@@ -1977,12 +1944,7 @@ QmlList<QmlTransition *>* QFxItem::transitions()
     return d->states()->transitionsProperty();
 }
 
-/*!
-  \internal
-  \property QFxItem::filter
-*/
-
-/*!
+/*
   \qmlproperty list<Filter> Item::filter
   This property holds a list of graphical filters to be applied to the item.
 
@@ -2205,11 +2167,17 @@ QPointF QFxItemPrivate::computeTransformOrigin() const
     }
 }
 
+/*!
+    \reimp
+*/
 bool QFxItem::sceneEvent(QEvent *event)
 {
     return QGraphicsItem::sceneEvent(event);
 }
 
+/*!
+    \reimp
+*/
 QVariant QFxItem::itemChange(GraphicsItemChange change,
                                        const QVariant &value)
 {
@@ -2220,6 +2188,9 @@ QVariant QFxItem::itemChange(GraphicsItemChange change,
     return QGraphicsItem::itemChange(change, value);
 }
 
+/*!
+    \reimp
+*/
 QRectF QFxItem::boundingRect() const
 {
     Q_D(const QFxItem);
@@ -2441,10 +2412,16 @@ bool QFxItem::hasActiveFocus() const
     return QGraphicsItem::hasFocus();
 }
 
+/*!
+    \reimp
+*/
 void QFxItem::paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *)
 {
 }
 
+/*!
+    \reimp
+*/
 bool QFxItem::event(QEvent *ev)
 {
     return QGraphicsObject::event(ev);
diff --git a/src/declarative/fx/qfxlistview.cpp b/src/declarative/fx/qfxlistview.cpp
index 0232717..b6301f6 100644
--- a/src/declarative/fx/qfxlistview.cpp
+++ b/src/declarative/fx/qfxlistview.cpp
@@ -1260,9 +1260,6 @@ void QFxListView::viewportMoved()
     }
 }
 
-/*!
-    \reimp
-*/
 qreal QFxListView::minYExtent() const
 {
     Q_D(const QFxListView);
@@ -1275,9 +1272,6 @@ qreal QFxListView::minYExtent() const
     return extent;
 }
 
-/*!
-    \reimp
-*/
 qreal QFxListView::maxYExtent() const
 {
     Q_D(const QFxListView);
@@ -1294,9 +1288,6 @@ qreal QFxListView::maxYExtent() const
     return extent;
 }
 
-/*!
-    \reimp
-*/
 qreal QFxListView::minXExtent() const
 {
     Q_D(const QFxListView);
@@ -1309,9 +1300,6 @@ qreal QFxListView::minXExtent() const
     return extent;
 }
 
-/*!
-    \reimp
-*/
 qreal QFxListView::maxXExtent() const
 {
     Q_D(const QFxListView);
diff --git a/src/declarative/fx/qfxloader.cpp b/src/declarative/fx/qfxloader.cpp
index 6d06ee9..95ddae3 100644
--- a/src/declarative/fx/qfxloader.cpp
+++ b/src/declarative/fx/qfxloader.cpp
@@ -85,13 +85,6 @@ QFxLoader::~QFxLoader()
 }
 
 /*!
-    \internal
-    \fn void QFxItem::sourceChanged()
-    This signal is emitted whenever the item's dynamic QML
-    source url changes.
- */
-
-/*!
     \qmlproperty url Loader::source
     This property holds the dynamic URL of the QML for the item.
 
diff --git a/src/declarative/fx/qfxmouseregion.cpp b/src/declarative/fx/qfxmouseregion.cpp
index 88a5c36..c0314f1 100644
--- a/src/declarative/fx/qfxmouseregion.cpp
+++ b/src/declarative/fx/qfxmouseregion.cpp
@@ -481,8 +481,8 @@ void QFxMouseRegion::timerEvent(QTimerEvent *event)
     \qmlproperty bool MouseRegion::containsMouse
     This property holds whether the mouse is currently inside the mouse region.
 
-    \warning This property is only partially implemented -- it is only valid when the mouse is moved over the
-    region.  If the region moves under the mouse, \e containsMouse will not change.
+    \warning This property is not updated if the region moves under the mouse: \e containsMouse will not change.
+    In addition, if hoverEnabled is false, containsMouse will only be valid when the mouse is pressed.
 */
 bool QFxMouseRegion::hovered() const
 {
diff --git a/src/declarative/fx/qfxtextinput.cpp b/src/declarative/fx/qfxtextinput.cpp
index eb6c5bf..164739f 100644
--- a/src/declarative/fx/qfxtextinput.cpp
+++ b/src/declarative/fx/qfxtextinput.cpp
@@ -53,8 +53,8 @@ QML_DEFINE_NOCREATE_TYPE(QValidator);
 QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,QIntValidator,QIntValidator);
 
 /*!
-    \qmlclass LineEdit
-    The LineEdit item allows you to add an editable line of text to a scene.
+    \qmlclass TextInput
+    The TextInput item allows you to add an editable line of text to a scene.
 */
 QFxTextInput::QFxTextInput(QFxItem* parent)
     : QFxPaintedItem(*(new QFxTextInputPrivate), parent)
@@ -78,9 +78,9 @@ QFxTextInput::~QFxTextInput()
 }
 
 /*!
-    \qmlproperty string LineEdit::text
+    \qmlproperty string TextInput::text
 
-    The text in the LineEdit.
+    The text in the TextInput.
 */
 
 QString QFxTextInput::text() const
@@ -99,9 +99,9 @@ void QFxTextInput::setText(const QString &s)
 }
 
 /*!
-    \qmlproperty font LineEdit::font
+    \qmlproperty font TextInput::font
 
-    Set the LineEdit's font attributes.  \c font.size sets the font's point size.
+    Set the TextInput's font attributes.  \c font.size sets the font's point size.
 */
 QFont QFxTextInput::font() const
 {
@@ -125,7 +125,7 @@ void QFxTextInput::setFont(const QFont &font)
 }
 
 /*!
-    \qmlproperty color LineEdit::color
+    \qmlproperty color TextInput::color
 
     The text color.
 */
@@ -143,7 +143,7 @@ void QFxTextInput::setColor(const QColor &c)
 
 
 /*!
-    \qmlproperty color LineEdit::highlightColor
+    \qmlproperty color TextInput::highlightColor
 
     The text highlight color, used behind selections.
 */
@@ -164,7 +164,7 @@ void QFxTextInput::setHighlightColor(const QColor &color)
 }
 
 /*!
-    \qmlproperty color LineEdit::highlightedTextColor
+    \qmlproperty color TextInput::highlightedTextColor
 
     The highlighted text color, used in selections.
 */
@@ -222,7 +222,7 @@ void QFxTextInput::setMaxLength(int ml)
 }
 
 /*!
-    \qmlproperty bool LineEdit::cursorVisible
+    \qmlproperty bool TextInput::cursorVisible
     If true the text edit shows a cursor.
 
     This property is set and unset when the line edit gets focus, but it can also
@@ -245,8 +245,8 @@ void QFxTextInput::setCursorVisible(bool on)
 }
 
 /*!
-    \qmlproperty int LineEdit::cursorPosition
-    The position of the cursor in the LineEdit.
+    \qmlproperty int TextInput::cursorPosition
+    The position of the cursor in the TextInput.
 */
 int QFxTextInput::cursorPosition() const
 {
@@ -260,7 +260,7 @@ void QFxTextInput::setCursorPosition(int cp)
 }
 
 /*!
-    \qmlproperty int LineEdit::selectionStart
+    \qmlproperty int TextInput::selectionStart
 
     The cursor position before the first character in the current selection.
     Setting this and selectionEnd allows you to specify a selection in the
@@ -288,7 +288,7 @@ void QFxTextInput::setSelectionStart(int s)
 }
 
 /*!
-    \qmlproperty int LineEdit::selectionEnd
+    \qmlproperty int TextInput::selectionEnd
 
     The cursor position after the last character in the current selection.
     Setting this and selectionStart allows you to specify a selection in the
@@ -369,12 +369,12 @@ void QFxTextInput::setEchoMode(uint echo)
 }
 
 /*!
-    \qmlproperty Component LineEdit::cursorDelegate
-    The delegate for the cursor in the LineEdit.
+    \qmlproperty Component TextInput::cursorDelegate
+    The delegate for the cursor in the TextInput.
 
-    If you set a cursorDelegate for a LineEdit, this delegate will be used for
+    If you set a cursorDelegate for a TextInput, this delegate will be used for
     drawing the cursor instead of the standard cursor. An instance of the
-    delegate will be created and managed by the LineEdit when a cursor is
+    delegate will be created and managed by the TextInput when a cursor is
     needed, and the x property of delegate instance will be set so as
     to be one pixel before the top left of the current character.
 
@@ -522,7 +522,7 @@ void QFxTextInput::selectAll()
 
 
 /*!
-    \qmlproperty bool LineEdit::smooth
+    \qmlproperty bool TextInput::smooth
 
     Set this property if you want the text to be smoothly scaled or
     transformed.  Smooth filtering gives better visual quality, but is slower.  If
diff --git a/src/declarative/qml/qmlcontext.cpp b/src/declarative/qml/qmlcontext.cpp
index 365c0e8..61850c3 100644
--- a/src/declarative/qml/qmlcontext.cpp
+++ b/src/declarative/qml/qmlcontext.cpp
@@ -339,7 +339,7 @@ QmlContext *QmlContext::parentContext() const
 }
 
 /*!
-    Add a default \a object to this context.  The object will be added after
+    Add \a defaultObject to this context.  The object will be added after
     any existing default objects.
 */
 void QmlContext::addDefaultObject(QObject *defaultObject)
@@ -417,7 +417,7 @@ void QmlContext::setContextProperty(const QString &name, QObject *value)
     Resolves the URL \a src relative to the URL of the
     containing component.
 
-    \sa QmlEngine::componentUrl(), setBaseUrl()
+    \sa QmlEngine::baseUrl(), setBaseUrl()
 */
 QUrl QmlContext::resolvedUrl(const QUrl &src)
 {
@@ -441,13 +441,12 @@ QUrl QmlContext::resolvedUrl(const QUrl &src)
 }
 
 /*!
-    Explicitly sets the url both resolveUri() and resolveUrl() will
-    use for relative references to \a baseUrl.
+    Explicitly sets the url resolveUrl() will use for relative references to \a baseUrl.
 
     Calling this function will override the url of the containing
     component used by default.
 
-    \sa resolvedUrl(), resolvedUri()
+    \sa resolvedUrl()
 */
 void QmlContext::setBaseUrl(const QUrl &baseUrl)
 {
diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp
index 558bd49..0a05094 100644
--- a/src/declarative/qml/qmlengine.cpp
+++ b/src/declarative/qml/qmlengine.cpp
@@ -532,15 +532,6 @@ void QmlDeclarativeData::destroyed(QObject *object)
     delete this;
 }
 
-/*! \internal */
-/*
-QScriptEngine *QmlEngine::scriptEngine()
-{
-    Q_D(QmlEngine);
-    return &d->scriptEngine;
-}
-*/
-
 /*!
     Creates a QScriptValue allowing you to use \a object in QML script.
     \a engine is the QmlEngine it is to be created in.
@@ -1054,36 +1045,39 @@ struct QmlEnginePrivate::ImportedNamespace {
             QUrl url = QUrl(urls.at(i) + QLatin1String("/") + type + QLatin1String(".qml"));
             int vmaj = majversions.at(i);
             int vmin = minversions.at(i);
-            // XXX search non-files too! (eg. zip files, see QT-524)
-            QFileInfo f(url.toLocalFile());
-            if (f.exists()) {
-                bool ok=true;
-                if (vmaj || vmin) {
-                    QString version = QString::number(vmaj) + QLatin1String(".") + QString::number(vmin);
-                    ok=false;
-                    // Check version file - XXX cache these in QmlEngine!
-                    QFile qmldir(urls.at(i)+QLatin1String("/qmldir"));
-                    if (qmldir.open(QIODevice::ReadOnly)) {
-                        do {
-                            QString line = QString::fromUtf8(qmldir.readLine());
-                            if (line.at(0) == QLatin1Char('#'))
-                                continue;
-                            int space1 = line.indexOf(QLatin1Char(' '));
-                            int space2 = space1 >=0 ? line.indexOf(QLatin1Char(' '),space1+1) : -1;
-                            QStringRef maptype = line.leftRef(space1);
-                            QStringRef mapversion = line.midRef(space1+1,space2<0?line.length()-space1-2:space2-space1-1);
-                            QStringRef mapfile = space2<0 ? QStringRef() : line.midRef(space2+1,line.length()-space2-2);
-                            if (maptype==type && mapversion==version) {
-                                if (mapfile.isEmpty())
-                                    return url;
-                                else
+            if (vmaj || vmin) {
+                // Check version file - XXX cache these in QmlEngine!
+                QFile qmldir(QUrl(urls.at(i)+QLatin1String("/qmldir")).toLocalFile());
+                if (qmldir.open(QIODevice::ReadOnly)) {
+                    do {
+                        QString line = QString::fromUtf8(qmldir.readLine());
+                        if (line.at(0) == QLatin1Char('#'))
+                            continue;
+                        int space1 = line.indexOf(QLatin1Char(' '));
+                        int space2 = space1 >=0 ? line.indexOf(QLatin1Char(' '),space1+1) : -1;
+                        QStringRef maptype = line.leftRef(space1);
+                        if (maptype==type) {
+                            // eg. 1.2-5
+                            QString mapversions = line.mid(space1+1,space2<0?line.length()-space1-2:space2-space1-1);
+                            int dot = mapversions.indexOf(QLatin1Char('.'));
+                            int dash = mapversions.indexOf(QLatin1Char('-'));
+                            int mapvmaj = mapversions.left(dot).toInt();
+                            if (mapvmaj==vmaj) {
+                                int mapvmin_from = (dash <= 0 ? mapversions.mid(dot+1) : mapversions.mid(dot+1,dash-dot-1)).toInt();
+                                int mapvmin_to = dash <= 0 ? mapvmin_from : mapversions.mid(dash+1).toInt();
+                                if (vmin >= mapvmin_from && vmin <= mapvmin_to) {
+                                    QStringRef mapfile = space2<0 ? QStringRef() : line.midRef(space2+1,line.length()-space2-2);
                                     return url.resolved(mapfile.toString());
+                                }
                             }
-                        } while (!qmldir.atEnd());
-                    }
+                        }
+                    } while (!qmldir.atEnd());
                 }
-                if (ok)
-                    return url;
+            } else {
+                // XXX search non-files too! (eg. zip files, see QT-524)
+                QFileInfo f(url.toLocalFile());
+                if (f.exists())
+                    return url; // (unversioned) local import
             }
         }
         return QUrl();
@@ -1133,7 +1127,7 @@ public:
             foreach (QString p, importPath) {
                 QString dir = p+QLatin1Char('/')+url;
                 if (QFile::exists(dir+QLatin1String("/qmldir"))) {
-                    url = dir;
+                    url = QLatin1String("file://")+dir;
                     found = true;
                     break;
                 }
diff --git a/src/declarative/qml/qmlengine.h b/src/declarative/qml/qmlengine.h
index 6066059..8caa505 100644
--- a/src/declarative/qml/qmlengine.h
+++ b/src/declarative/qml/qmlengine.h
@@ -74,7 +74,6 @@ public:
 
     void clearComponentCache();
 
-
     void addImportPath(const QString& dir);
 
     void setNetworkAccessManager(QNetworkAccessManager *);
diff --git a/src/declarative/qml/qmlmetaproperty.cpp b/src/declarative/qml/qmlmetaproperty.cpp
index e69746e..99f9f0c 100644
--- a/src/declarative/qml/qmlmetaproperty.cpp
+++ b/src/declarative/qml/qmlmetaproperty.cpp
@@ -540,10 +540,10 @@ QmlAbstractBinding *QmlMetaProperty::binding() const
 }
 
 /*!
-    Set the binding associated with this property to \a binding.  Returns
+    Set the binding associated with this property to \a newBinding.  Returns
     the existing binding (if any), otherwise 0.
 
-    \a binding will be enabled, and the returned binding (if any) will be
+    \a newBinding will be enabled, and the returned binding (if any) will be
     disabled.
 */
 QmlAbstractBinding *
diff --git a/src/declarative/util/qfxview.cpp b/src/declarative/util/qfxview.cpp
index 2c02cee..3acbf56 100644
--- a/src/declarative/util/qfxview.cpp
+++ b/src/declarative/util/qfxview.cpp
@@ -310,8 +310,8 @@ void QFxView::continueExecute()
   This signal is emitted when the view is resized to \a size.
  */
 
-/*! \fn void QFxView::error(const QList<QmlError> &errors)
-  This signal is emitted when the qml loaded contains errors.
+/*! \fn void QFxView::errors(const QList<QmlError> &errors)
+  This signal is emitted when the qml loaded contains \a errors.
  */
 
 /*!
diff --git a/src/declarative/util/qfxview.h b/src/declarative/util/qfxview.h
index 03557a3..25e2997 100644
--- a/src/declarative/util/qfxview.h
+++ b/src/declarative/util/qfxview.h
@@ -62,7 +62,8 @@ class QmlError;
 class QFxViewPrivate;
 class Q_DECLARATIVE_EXPORT QFxView : public QGraphicsView
 {
-Q_OBJECT
+    Q_OBJECT
+    Q_PROPERTY(bool contentResizable READ contentResizable WRITE setContentResizable)
 public:
     explicit QFxView(QWidget *parent = 0);
 
diff --git a/src/declarative/util/qmlpalette.cpp b/src/declarative/util/qmlpalette.cpp
index e714bc7..d500986 100644
--- a/src/declarative/util/qmlpalette.cpp
+++ b/src/declarative/util/qmlpalette.cpp
@@ -62,7 +62,7 @@ QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,Palette,QmlPalette)
 
     Example:
     \code
-    Palette { id: MyPalette; colorGroup: "Active" }
+    Palette { id: MyPalette; colorGroup: Qt.Active }
 
     Rect {
         width: 640; height: 480