aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/imports/folderlistmodel/qquickfolderlistmodel.cpp2
-rw-r--r--src/quick/doc/src/qmltypereference.qdoc3
-rw-r--r--src/quick/items/qquickitem.cpp4
3 files changed, 3 insertions, 6 deletions
diff --git a/src/imports/folderlistmodel/qquickfolderlistmodel.cpp b/src/imports/folderlistmodel/qquickfolderlistmodel.cpp
index 5ed38db3d7..f8d43f0594 100644
--- a/src/imports/folderlistmodel/qquickfolderlistmodel.cpp
+++ b/src/imports/folderlistmodel/qquickfolderlistmodel.cpp
@@ -453,7 +453,7 @@ void QQuickFolderListModel::setFolder(const QUrl &folder)
/*!
- \qmlproperty url QQuickFolderListModel::rootFolder
+ \qmlproperty url FolderListModel::rootFolder
When the rootFolder is set, then this folder will
be threated as the root in the file system, so that
diff --git a/src/quick/doc/src/qmltypereference.qdoc b/src/quick/doc/src/qmltypereference.qdoc
index 7fc9bea032..3f9de28c9d 100644
--- a/src/quick/doc/src/qmltypereference.qdoc
+++ b/src/quick/doc/src/qmltypereference.qdoc
@@ -322,7 +322,8 @@ set of Particle System types for Qt Quick 2
/*!
\qmlmodule QtQuick 2.2
-\brief The Provides graphical primitives for use in QML.
+\title Qt Quick QML Types
+\brief This module provides graphical primitives for use in QML.
The \l{Qt Quick} module provides graphical primitive types. They can be used with the following import
\code
diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp
index f7dc21148c..c7a713de53 100644
--- a/src/quick/items/qquickitem.cpp
+++ b/src/quick/items/qquickitem.cpp
@@ -5740,10 +5740,6 @@ qreal QQuickItem::y() const
}
/*!
- \property QQuickItem::pos
- \internal
- */
-/*!
\internal
*/
QPointF QQuickItem::position() const