summaryrefslogtreecommitdiffstats
path: root/doc/src/getting-started
diff options
context:
space:
mode:
Diffstat (limited to 'doc/src/getting-started')
-rw-r--r--doc/src/getting-started/examples.qdoc6
-rw-r--r--doc/src/getting-started/gettingstarted.qdoc2
-rw-r--r--doc/src/getting-started/gettingstartedqml.qdoc2
-rw-r--r--doc/src/getting-started/how-to-learn-qt.qdoc4
-rw-r--r--doc/src/getting-started/installation.qdoc11
5 files changed, 14 insertions, 11 deletions
diff --git a/doc/src/getting-started/examples.qdoc b/doc/src/getting-started/examples.qdoc
index 67000e2..296e032 100644
--- a/doc/src/getting-started/examples.qdoc
+++ b/doc/src/getting-started/examples.qdoc
@@ -488,10 +488,12 @@
\image ipc-examples.png
\list
- \o \l{ipc/localfortuneclient}{Local Fortune Client}\raisedaster
- \o \l{ipc/localfortuneserver}{Local Fortune Server}\raisedaster
+ \o \l{ipc/localfortuneclient}{Local Fortune Client}
+ \o \l{ipc/localfortuneserver}{Local Fortune Server}
\o \l{ipc/sharedmemory}{Shared Memory}\raisedaster
\endlist
+
+ Examples marked with an asterisk (*) are fully documented.
*/
/*!
diff --git a/doc/src/getting-started/gettingstarted.qdoc b/doc/src/getting-started/gettingstarted.qdoc
index 2b8078e..502fb65 100644
--- a/doc/src/getting-started/gettingstarted.qdoc
+++ b/doc/src/getting-started/gettingstarted.qdoc
@@ -33,7 +33,7 @@
\section1
Creating applications using Qt and QML is easy enough once you get started.
To get you started we have created two tutorials creating two similar applications,
- but using diiferent approaches. One tutorial implements the user interface using
+ but using different approaches. One tutorial implements the user interface using
QML, while the other implements the whole application using traditional Qt.
Please click on the links below to start the ride.
diff --git a/doc/src/getting-started/gettingstartedqml.qdoc b/doc/src/getting-started/gettingstartedqml.qdoc
index 13f1192..ccb9771 100644
--- a/doc/src/getting-started/gettingstartedqml.qdoc
+++ b/doc/src/getting-started/gettingstartedqml.qdoc
@@ -133,7 +133,7 @@
the interactive area where mouse movements are detected. For our button, we anchor the
whole MouseArea to its parent, which is \c simplebutton. The \c anchors.fill syntax is
one way of accessing a specific property called \c fill inside a group of properties
- called \c anchors. QML uses \l {Anchor-based Layout in QML}{anchor based layouts} where
+ called \c anchors. QML uses \l {Anchor-Based Layout in QML}{anchor-based layouts} where
items can anchor to another item, creating robust layouts.
The \c MouseArea has many signal handlers that are called during mouse movements within
diff --git a/doc/src/getting-started/how-to-learn-qt.qdoc b/doc/src/getting-started/how-to-learn-qt.qdoc
index 5c1e5ca..239c8a1 100644
--- a/doc/src/getting-started/how-to-learn-qt.qdoc
+++ b/doc/src/getting-started/how-to-learn-qt.qdoc
@@ -51,9 +51,9 @@
key overviews to deepen your understanding of Qt: The Qt \l{Object
Model} and \l{Signals and Slots}.
- \beginfloatleft
+ \div{float-left}
\inlineimage qtdemo-small.png
- \endfloat
+ \enddiv
\section1 Getting an Overview
diff --git a/doc/src/getting-started/installation.qdoc b/doc/src/getting-started/installation.qdoc
index 4b4dab5..d39bb39 100644
--- a/doc/src/getting-started/installation.qdoc
+++ b/doc/src/getting-started/installation.qdoc
@@ -1028,9 +1028,9 @@ We hope you will enjoy using Qt.
Qt from its source code, you will also need to install the development
packages for these libraries for your system.
- \table 90%
- \header \o Name \o Library \o Notes \o Configuration options \o Minimum working version
\raw HTML
+ <table class="generic">
+ <thead><tr class="qt-style topAlign"><th>Name</th><th>Library</th><th>Notes</th><th>Configuration options</th><th>Minimum working version
<tr id="OptionalColor">
<td> XRender </td><td> libXrender </td><td> X Rendering Extension; used for anti-aliasing</td>
<td><tt>-xrender</tt> or auto-detected</td><td>0.9.0</td>
@@ -1077,9 +1077,9 @@ We hope you will enjoy using Qt.
</tr><tr id="PthreadColor">
<td> pthread </td><td> libpthread </td><td> Multithreading</td>
<td></td><td>2.3.5</td>
- </tr>
+ </tr></th></tr></thead>
+ </table>
\endraw
- \endtable
\note You must compile with XRender support to get alpha transparency
support for pixmaps and images.
@@ -1167,8 +1167,9 @@ We hope you will enjoy using Qt.
{Windows Mobile 6 Professional/Standard}
\endlist
+ \bold{Note:}
\table
- \row \bold{Note:}
+ \row
\o
\list 1
\o Currently, there is only compile support for Windows CE 5.0