Merge branch 'dev' of ssh://codereview.qt-project.org/qt/qtdeclarative into wip/v4

Conflicts:
	src/quick/items/context2d/qquickcontext2d.cpp
	tests/auto/quick/qquickvisualdatamodel/qquickvisualdatamodel.pro

Change-Id: I36a4fd28b3156839aecd70039a3ba566bf19a0bc

1 files changed, 9 insertions, 9 deletions

diff --git a/src/qml/types/qqmllistmodel.cpp b/src/qml/types/qqmllistmodel.cpp
index 4c0b382439..067d91ea7f 100644
--- a/src/qml/types/qqmllistmodel.cpp
+++ b/src/qml/types/qqmllistmodel.cpp
@@ -1838,7 +1838,7 @@ int QQmlListModel::count() const
 }
 
 /*!
-    \qmlmethod QtQml2::ListModel::clear()
+    \qmlmethod ListModel::clear()
 
     Deletes all content from the model.
 
@@ -1860,7 +1860,7 @@ void QQmlListModel::clear()
 }
 
 /*!
-    \qmlmethod QtQml2::ListModel::remove(int index, int count = 1)
+    \qmlmethod ListModel::remove(int index, int count = 1)
 
     Deletes the content at \a index from the model.
 
@@ -1894,7 +1894,7 @@ void QQmlListModel::remove(QQmlV4Function *args)
 }
 
 /*!
-    \qmlmethod QtQml2::ListModel::insert(int index, jsobject dict)
+    \qmlmethod ListModel::insert(int index, jsobject dict)
 
     Adds a new item to the list model at position \a index, with the
     values in \a dict.
@@ -1952,7 +1952,7 @@ void QQmlListModel::insert(QQmlV4Function *args)
 }
 
 /*!
-    \qmlmethod QtQml2::ListModel::move(int from, int to, int n)
+    \qmlmethod ListModel::move(int from, int to, int n)
 
     Moves \a n items \a from one position \a to another.
 
@@ -2005,7 +2005,7 @@ void QQmlListModel::move(int from, int to, int n)
 }
 
 /*!
-    \qmlmethod QtQml2::ListModel::append(jsobject dict)
+    \qmlmethod ListModel::append(jsobject dict)
 
     Adds a new item to the end of the list model, with the
     values in \a dict.
@@ -2056,7 +2056,7 @@ void QQmlListModel::append(QQmlV4Function *args)
 }
 
 /*!
-    \qmlmethod object QtQml2::ListModel::get(int index)
+    \qmlmethod object ListModel::get(int index)
 
     Returns the item at \a index in the list model. This allows the item
     data to be accessed or modified from JavaScript:
@@ -2106,7 +2106,7 @@ QQmlV4Handle QQmlListModel::get(int index) const
 }
 
 /*!
-    \qmlmethod QtQml2::ListModel::set(int index, jsobject dict)
+    \qmlmethod ListModel::set(int index, jsobject dict)
 
     Changes the item at \a index in the list model with the
     values in \a dict. Properties not appearing in \a dict
@@ -2160,7 +2160,7 @@ void QQmlListModel::set(int index, const QQmlV4Handle &handle)
 }
 
 /*!
-    \qmlmethod QtQml2::ListModel::setProperty(int index, string property, variant value)
+    \qmlmethod ListModel::setProperty(int index, string property, variant value)
 
     Changes the \a property of the item at \a index in the list model to \a value.
 
@@ -2203,7 +2203,7 @@ void QQmlListModel::setProperty(int index, const QString& property, const QVaria
 }
 
 /*!
-    \qmlmethod QtQml2::ListModel::sync()
+    \qmlmethod ListModel::sync()
 
     Writes any unsaved changes to the list model after it has been modified
     from a worker script.