summaryrefslogtreecommitdiffstats
path: root/doc/src
diff options
context:
space:
mode:
Diffstat (limited to 'doc/src')
-rw-r--r--doc/src/declarative/elements.qdoc47
-rw-r--r--doc/src/declarative/qmlfordesign.qdoc (renamed from doc/src/declarative/index.qdoc)15
-rw-r--r--doc/src/index.qdoc2
3 files changed, 39 insertions, 25 deletions
diff --git a/doc/src/declarative/elements.qdoc b/doc/src/declarative/elements.qdoc
index 3e88e5a..b6dec25 100644
--- a/doc/src/declarative/elements.qdoc
+++ b/doc/src/declarative/elements.qdoc
@@ -7,10 +7,11 @@ The following table lists the Qml elements provided by the Qt Declarative module
\bold {Standard Qt Declarative Elements}
-\table 100%
+\table 80%
\header
\o \bold {States}
\o \bold {Animation and Transitions}
+\o \bold {Working with Data}
\o \bold {Utility}
\row
@@ -40,22 +41,30 @@ The following table lists the Qml elements provided by the Qt Declarative module
\o
\list
-\o \l Script
\o \l Bind
-\o \l Connection
-\o \l Component
\o \l ListModel
+\o \l XmlListModel
+\o \l SqlQuery, \l SqlConnection, and \l SqlBind
\o \l DateTimeFormatter
+\o \l NumberFormatter
+\endlist
+
+\o
+\list
+\o \l Script
+\o \l Connection
+\o \l Component
\endlist
\endtable
\bold {Fluid UI Primitives}
-\table 100%
+\table 80%
\header
-\o \bold {Basic Items}
-\o \bold {Utility}
+\o \bold {Basic Visual Items}
+\o \bold {Basic Interaction Items}
\o \bold {Widgets}
+\o \bold {Utility}
\row
\o
@@ -65,20 +74,17 @@ The following table lists the Qml elements provided by the Qt Declarative module
\o \l Text
\o \l TextEdit
\o \l Rect
-\o \l MouseRegion
-\o \l KeyActions
\o \l AnimatedImage
\o \l BlendedImage
\endlist
\o
\list
-\o \l Repeater
-\o \l Content
+\o \l MouseRegion
+\o \l KeyActions
\o \l FocusPanel
\o \l FocusRealm
\o \l KeyProxy
-\o \l ComponentInstance
\endlist
\o
@@ -88,9 +94,18 @@ The following table lists the Qml elements provided by the Qt Declarative module
\o \l WebView
\endlist
+\o
+\list
+\o \l Repeater
+\o \l Content
+\o \l ComponentInstance
+\o \l WidgetContainer
+\endlist
+
\header
\o \bold {Views}
\o \bold {Layouts}
+\o \bold {Transforms}
\o \bold {Effects}
\row
@@ -122,6 +137,14 @@ The following table lists the Qml elements provided by the Qt Declarative module
\o
\list
+\o \l Squish
+\o \l Perspective
+\o \l Rotation3D
+\o \l Translation3D
+\endlist
+
+\o
+\list
\o \l Shadow
\o \l Reflection
\o \l Blur
diff --git a/doc/src/declarative/index.qdoc b/doc/src/declarative/qmlfordesign.qdoc
index fe1b46e..35e47df 100644
--- a/doc/src/declarative/index.qdoc
+++ b/doc/src/declarative/qmlfordesign.qdoc
@@ -1,6 +1,6 @@
/*!
- \page qml.html
- \title 'Qt Declarative' Documentation
+ \page qmlfordesigners.html
+ \title Qt Declarative for Designers
\target qtdeclarativemainpage
@@ -13,8 +13,7 @@
Building fluid applications is done declaratively, rather than procedurally.
That is, you specify \e what the UI should look like and how it should behave
- in an declarative format called QML, rather than specifying step-by-step \e how to
- build it in a language like C++ or JavaScript. Specifying a UI declaratively
+ rather than specifying step-by-step \e how to build it. Specifying a UI declaratively
does not just include the layout of the interface items, but also the way each
individual item looks and behaves and the overall flow of the application.
@@ -23,7 +22,6 @@
\o \l {qmlexamples}{Examples}
\o \l {tutorial}{Tutorial: 'Hello World'}
\o \l {tutorials-declarative-contacts.html}{Tutorial: 'Introduction to QML'}
- \o \l {qmlforcpp}{Qt Declarative Markup Language For C++ Programmers}
\endlist
Core Features:
@@ -41,11 +39,4 @@
\list
\o \l {elements}{Qml Elements}
\endlist
-
- C++ Reference:
- \list
- \o \l {qtprogrammers}{QML for Qt programmers}
- \o \l {qtbinding}{C++ Data Binding}
- \o \l {cppitem}{C++ Components}
- \endlist
*/
diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc
index 8a856ea..f0debdb 100644
--- a/doc/src/index.qdoc
+++ b/doc/src/index.qdoc
@@ -188,7 +188,7 @@
<li><a href="qtxmlpatterns.html">XML Patterns: XQuery &amp; XPath</a></li>
<li><a href="phonon-module.html">Phonon Multimedia Framework</a></li>
<li><a href="qtscripttools.html">Script Tools Module</a></li>
- <li><a href="qml.html">Qt Markup Language</a></li>
+ <li><a href="qtdeclarative.html">Declarative Module</a></li>
<li><a href="activeqt.html">ActiveQt Framework</a></li>
</ul>
</td>