summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYann Bodson <yann.bodson@nokia.com>2010-05-24 06:19:37 (GMT)
committerYann Bodson <yann.bodson@nokia.com>2010-05-24 06:19:37 (GMT)
commit56f0ab34eff5282fc0444b95fa359535a96e5c1e (patch)
tree86a7857754971b984dd761ff9f2adfb44fe7d093
parent180e2ce2cca53f2c395e8dc9213d714c396c4555 (diff)
downloadQt-56f0ab34eff5282fc0444b95fa359535a96e5c1e.zip
Qt-56f0ab34eff5282fc0444b95fa359535a96e5c1e.tar.gz
Qt-56f0ab34eff5282fc0444b95fa359535a96e5c1e.tar.bz2
Doc fixes
-rw-r--r--doc/src/declarative/examples.qdoc6
-rw-r--r--examples/declarative/README4
2 files changed, 5 insertions, 5 deletions
diff --git a/doc/src/declarative/examples.qdoc b/doc/src/declarative/examples.qdoc
index a355f9f..6e0426c 100644
--- a/doc/src/declarative/examples.qdoc
+++ b/doc/src/declarative/examples.qdoc
@@ -56,17 +56,17 @@ sub-directory that show how to use various aspects of QML. In addition, the
applications. These demos are intended to show integrated functionality
rather than being instructive on specific elements.
-To run the examples and demos, you can use Qt Creator or the included \l {Qt Declarative UI Runtime}{qml}
+To run the examples and demos, you can use Qt Creator or the included \l {Qt Declarative UI Runtime}{qmlviewer}
command-line application. It has some useful options, revealed by:
\code
- bin/qml -help
+ bin/qmlviewer -help
\endcode
For example, from your build directory, run:
\code
- bin/qml $QTDIR/demos/declarative/samegame/samegame.qml
+ bin/qmlviewer $QTDIR/demos/declarative/samegame/samegame.qml
\endcode
\section1 Examples
diff --git a/examples/declarative/README b/examples/declarative/README
index 9e0f4c4..578c245 100644
--- a/examples/declarative/README
+++ b/examples/declarative/README
@@ -1,5 +1,5 @@
The Qt Declarative module provides the ability to specify and implement
-your UI declaratively, using the Qt Meta-Object Language(QML). This
+your user interface declaratively, using the Qt Meta-Object Language (QML). This
language is very expressive and human readable, and can be used by
designers to actually implement their UI vision. QML UIs can integrate
with C++ code in many ways, including being loaded as a part of a C++ UI
@@ -9,7 +9,7 @@ The example launcher provided with Qt can be used to explore each of the
examples in this directory. But most can also be viewed directly with the
QML viewer utility, without requiring compilation.
-Documentation for these examples can be found via the Tutorial and Examples
+Documentation for these examples can be found via the Tutorials and Examples
link in the main Qt documentation.