From f5f42d2a3e1cbd25b17ea87cff78255b79f38dfc Mon Sep 17 00:00:00 2001
From: Caroline Chao <caroline.chao@digia.com>
Date: Mon, 27 May 2013 09:46:13 +0200
Subject: [PATCH] Doc: Add Qt Quick Layouts QML Types page
Change-Id: If99150e2124dfdbf0bd99889129e66d487a9bd6a
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
---
src/layouts/doc/src/qtquicklayouts-index.qdoc | 7 ++-
src/layouts/doc/src/qtquicklayouts.qdoc | 46 +++++++++++++++++++
2 files changed, 52 insertions(+), 1 deletion(-)
create mode 100644 src/layouts/doc/src/qtquicklayouts.qdoc
diff --git a/src/layouts/doc/src/qtquicklayouts-index.qdoc b/src/layouts/doc/src/qtquicklayouts-index.qdoc
index 433de433f..fdc1c70a5 100644
--- a/src/layouts/doc/src/qtquicklayouts-index.qdoc
+++ b/src/layouts/doc/src/qtquicklayouts-index.qdoc
@@ -28,7 +28,6 @@
/*!
\page qtquicklayouts-index.html
\title Qt Quick Layouts
- \ingroup qmlmodules
\brief A module with a set of QML elements that arranges QML items in an user interface.
@@ -47,4 +46,10 @@
\annotatedlist layouts
+ \section1 Related information
+
+ \section2 Reference
+ \list
+ \li \l{Qt Quick Layouts QML Types}{Qt Quick Layouts QML Types}
+ \endlist
*/
diff --git a/src/layouts/doc/src/qtquicklayouts.qdoc b/src/layouts/doc/src/qtquicklayouts.qdoc
new file mode 100644
index 000000000..b03ff69b9
--- /dev/null
+++ b/src/layouts/doc/src/qtquicklayouts.qdoc
@@ -0,0 +1,46 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Free Documentation License Usage
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file. Please review the following information to ensure
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: http://www.gnu.org/copyleft/fdl.html.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+ \qmlmodule QtQuick.Layouts 1
+ \title Qt Quick Layouts QML Types
+ \ingroup qmlmodules
+ \brief Provides QML types for arranging QML items in a user interface.
+
+ The \l{Qt Quick Layouts} module provides QML types for arranging
+ QML items in a user interface.
+ These QML types work in conjunction with \l{Qt Quick} and
+ \l{Qt Quick Controls}.
+
+ The QML types can be imported into your application using the
+ following import statement in your .qml file.
+
+ \code
+ import QtQuick.Layouts 1.0
+ \endcode
+
+*/
--
GitLab