summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorDavid Boddie <david.boddie@nokia.com>2011-04-05 14:41:44 (GMT)
committerDavid Boddie <david.boddie@nokia.com>2011-04-05 14:41:44 (GMT)
commit17b9675da72ddf90a4ec8448b7c57681e482d91b (patch)
tree0c8597c38aa6b491e728fbf1cdf6b6ff41ecb4f4 /doc
parent0ea9bd7d6100993bb4b06b4dedb799ae768cacdf (diff)
parent9ee276e8a582679d50803b5c5a5f12f1b9aa9df5 (diff)
downloadQt-17b9675da72ddf90a4ec8448b7c57681e482d91b.zip
Qt-17b9675da72ddf90a4ec8448b7c57681e482d91b.tar.gz
Qt-17b9675da72ddf90a4ec8448b7c57681e482d91b.tar.bz2
Merge branch '4.7' of ../qt-doc-team-threading into 4.7
Conflicts: doc/src/getting-started/tutorials.qdoc
Diffstat (limited to 'doc')
-rw-r--r--doc/src/howtos/scalabilityintro.qdoc10
-rw-r--r--doc/src/tutorials/threads.qdoc2
2 files changed, 6 insertions, 6 deletions
diff --git a/doc/src/howtos/scalabilityintro.qdoc b/doc/src/howtos/scalabilityintro.qdoc
index 5b4e58b..b1d9c19 100644
--- a/doc/src/howtos/scalabilityintro.qdoc
+++ b/doc/src/howtos/scalabilityintro.qdoc
@@ -198,11 +198,11 @@
\list
\o \l{Item::anchors.top}{anchors} within an Item
\o \l{Row} / \l{Column} / \l{Grid}
- \o simple javascript expressions such as width: Math.round(parent.width / 3.0).
+ \o simple JavaScript expressions such as width: Math.round(parent.width / 3.0).
\endlist
These basic building blocks, along with the powerful evaluation
- capabilities of javascript expressions within every QML binding,
+ capabilities of JavaScript expressions within every QML binding,
are designed to allow the majority of the layout structure
definition to be defined in a Device Profile independent way.
@@ -214,14 +214,14 @@
container.
By combining the features of the layout managers with simple
- javascript expressions, a richer variety of designs can be
+ JavaScript expressions, a richer variety of designs can be
expressed, without having to resort to additional layout
measurement parameters or measurement values.
Here are some things not to do with layouts:
\list
- \o Don't define complex javascript functions that are regularly
+ \o Don't define complex JavaScript functions that are regularly
evaluated. This will cause poor performance, particularly
during animated transitions.
\o Don't define all of your layouts using x, y, width and
@@ -275,7 +275,7 @@
by the top level orientation change), in the case of anchor
layouts, AnchorAnimation elements can be used to control the
transitions. In some cases, you can also use a NumberAnimation on
- e.g. the width of an item. Remember to avoid complex javascript
+ e.g. the width of an item. Remember to avoid complex JavaScript
calculations during each frame of animation. Using simple anchor
definitions and anchor animations can help with this in the
majority of cases.
diff --git a/doc/src/tutorials/threads.qdoc b/doc/src/tutorials/threads.qdoc
index 1d807a0..2d6a540 100644
--- a/doc/src/tutorials/threads.qdoc
+++ b/doc/src/tutorials/threads.qdoc
@@ -33,7 +33,7 @@
\title Threading Basics
\brief An introduction to threads
- \section1 What Are Threads
+ \section1 What Are Threads?
Threads are about doing things in parallel, just like processes. So how do
threads differ from processes? While you are making calculations on a