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

2 files changed, 5 insertions, 7 deletions

diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp
index 7f2a3e1..351bd8a 100644
--- a/src/declarative/qml/qmlengine.cpp
+++ b/src/declarative/qml/qmlengine.cpp
@@ -71,6 +71,7 @@
 #include <QtCore/qthread.h>
 #include <QtCore/qcoreapplication.h>
 #include <QtCore/qdir.h>
+#include <QtGui/qvector3d.h>
 #include <qmlcomponent.h>
 #include "private/qmlcomponentjs_p.h"
 #include "private/qmlmetaproperty_p.h"
@@ -727,10 +728,7 @@ QScriptValue QmlEnginePrivate::vector(QScriptContext *ctxt, QScriptEngine *engin
     qsreal x = ctxt->argument(0).toNumber();
     qsreal y = ctxt->argument(1).toNumber();
     qsreal z = ctxt->argument(2).toNumber();
-    QString s = QString::number(x) + QLatin1Char(',') +
-                QString::number(y) + QLatin1Char(',') +
-                QString::number(z);
-    return QScriptValue(s);
+    return engine->newVariant(qVariantFromValue(QVector3D(x, y, z)));
 }
 
 QmlScriptClass::QmlScriptClass(QmlEngine *bindengine)
diff --git a/src/declarative/util/qmllistmodel.cpp b/src/declarative/util/qmllistmodel.cpp
index e2575ab..51b0dae 100644
--- a/src/declarative/util/qmllistmodel.cpp
+++ b/src/declarative/util/qmllistmodel.cpp
@@ -72,7 +72,7 @@ struct ListModelData
     \qmlclass ListModel 
     \brief The ListModel element defines a free-form list data source.
 
-    The ListModel is a simple hierarchy of items containing data roles.
+    The ListModel is a simple hierarchy of elements containing data roles.
     For example:
 
     \code
@@ -93,8 +93,8 @@ struct ListModelData
     }
     \endcode
 
-    Item roles (properties) must begin with a lower-case letter.  The above example defines a
-    ListModel containing three items, with the roles "name" and "cost".
+    Roles (properties) must begin with a lower-case letter.  The above example defines a
+    ListModel containing three elements, with the roles "name" and "cost".
 
     The defined model can be used in views such as ListView:
     \code