diff options
| author | Martin Smith <martin.smith@digia.com> | 2014-02-24 14:01:06 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-26 12:32:47 +0100 |
| commit | 62b2600d8a854a45f20f1ff296d15e485cd081a2 (patch) | |
| tree | bd05cbb47b5a8530c43fdc0f277b14d2665a97c0 | |
| parent | bac2ae20a47b85ac916cc0dfedb7144e7604e9ce (diff) | |
doc: Minor group/module page changes.
These changes were made in conjunction with the
large update to qdoc to teach it to use multiple
trees.
Task-number: QTBUG-35377
Change-Id: If16bfdf9186483c0b313c999c61fa4dc5cf49048
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
| -rw-r--r-- | src/imports/folderlistmodel/qquickfolderlistmodel.cpp | 2 | ||||
| -rw-r--r-- | src/quick/doc/src/qmltypereference.qdoc | 3 | ||||
| -rw-r--r-- | src/quick/items/qquickitem.cpp | 4 |
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 |