From 8b1a05e8d49e8cdc4caff1737c46f50a029d8add Mon Sep 17 00:00:00 2001
From: Caroline Chao <caroline.chao@digia.com>
Date: Mon, 13 May 2013 09:45:00 +0200
Subject: [PATCH] Doc: Remove Layouts from Qt Quick Controls index page
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Qt Quick Layouts is a module by itself and it is misleading to
list its items here.
Add a note instead to say that Qt Quick Controls can be used with
Qt Quick Layouts.
Change-Id: I0e0a506f5ff7f2702126388fa60ff075ee2cbb4e
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
---
src/controls/doc/src/qtquickcontrols-index.qdoc | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/controls/doc/src/qtquickcontrols-index.qdoc b/src/controls/doc/src/qtquickcontrols-index.qdoc
index 56b5b0d68..c349d02d4 100644
--- a/src/controls/doc/src/qtquickcontrols-index.qdoc
+++ b/src/controls/doc/src/qtquickcontrols-index.qdoc
@@ -36,6 +36,8 @@
The module is new in Qt 5.1 and requires \l{Qt Quick} 2.1.
+ \note \l{Qt Quick Layouts} can be used to arrange Qt Quick Controls in a user interface.
+
\note The current focus is on desktop, but in the long term Qt Quick Controls
are expected to be supported on mobile platforms too.
@@ -59,11 +61,6 @@
Controls are typically items that are used to present or receive input from the user.
\annotatedlist controls
- \section1 Layouts
- \l{Qt Quick Layouts}{Layouts} can be used to have dynamic user interfaces where the UI
- adapts to the available geometry.
- \annotatedlist layouts
-
\section1 Related information
\section2 Guides
--
GitLab