summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/src/development/qtestlib.qdoc7
-rw-r--r--doc/src/examples/basiclayouts.qdoc2
-rw-r--r--doc/src/getting-started/installation.qdoc16
-rw-r--r--doc/src/howtos/unix-signal-handlers.qdoc2
-rw-r--r--doc/src/overviews.qdoc2
-rw-r--r--doc/src/platforms/supported-platforms.qdoc4
-rwxr-xr-xdoc/src/template/style/style.css1
7 files changed, 18 insertions, 16 deletions
diff --git a/doc/src/development/qtestlib.qdoc b/doc/src/development/qtestlib.qdoc
index 23d6670..cc5afd2 100644
--- a/doc/src/development/qtestlib.qdoc
+++ b/doc/src/development/qtestlib.qdoc
@@ -749,9 +749,10 @@
\section1 External Tools
Tools for handling and visualizing test data are available as part of
- the \l{qtestlib-tools} project on the Qt Labs Web site. These include
- a tool for comparing performance data obtained from test runs and a
- utility to generate Web-based graphs of performance data.
+ the qtestlib-tools project on the
+ \l{http://labs.qt.nokia.com/}{http://labs.qt.nokia.com/}Qt Labs Web site.
+ These include a tool for comparing performance data obtained from test
+ runs and a utility to generate Web-based graphs of performance data.
See the \l{qtestlib-tools Announcement} for more information on these
tools and a simple graphing example.
diff --git a/doc/src/examples/basiclayouts.qdoc b/doc/src/examples/basiclayouts.qdoc
index 1ecf394..cbc9297 100644
--- a/doc/src/examples/basiclayouts.qdoc
+++ b/doc/src/examples/basiclayouts.qdoc
@@ -66,7 +66,7 @@
horizontal layout. Next we use the \c createGridGroupBox() function
to create a group box containing several line edits and a small text
editor which are displayed in a grid layout. Finally, we use the
- \c createFormGroupBox() function to createa a group box with
+ \c createFormGroupBox() function to create a group box with
three labels and three input fields: a line edit, a combo box and
a spin box.
diff --git a/doc/src/getting-started/installation.qdoc b/doc/src/getting-started/installation.qdoc
index 3eb761d..c6e79d9 100644
--- a/doc/src/getting-started/installation.qdoc
+++ b/doc/src/getting-started/installation.qdoc
@@ -392,10 +392,10 @@ must be run as root.
*/
/*! \page install-wince.html
-\title Installing Qt on Windows CE
+\title Installing Qt for Windows CE
\ingroup installation
\ingroup qtce
-\brief How to install Qt on Windows CE.
+\brief How to install Qt for Windows CE.
\previouspage Installation
\tableofcontents
@@ -492,9 +492,9 @@ in the \l{Qt for Windows CE Requirements} document.
*/
/*! \page install-Symbian-installer.html
-\title Installing Qt on the Symbian platform from a Binary Package
+\title Installing Qt for the Symbian platform from a Binary Package
\ingroup qtsymbian
-\brief How to install Qt on the Symbian platform from a binary package.
+\brief How to install Qt for the Symbian platform from a binary package.
\previouspage Installation
\tableofcontents
@@ -551,10 +551,10 @@ Symbian platform,
*/
/*! \page install-Symbian.html
-\title Installing Qt on the Symbian platform
+\title Installing Qt for the Symbian platform
\ingroup installation
\ingroup qtsymbian
-\brief How to install Qt on the Symbian platform.
+\brief How to install Qt for the Symbian platform.
\previouspage Installation
\tableofcontents
@@ -685,10 +685,10 @@ Binary Package} document.
*/
/*! \page install-Symbian-linux.html
-\title Installing Qt on the Symbian platform using Linux (experimental)
+\title Installing Qt for the Symbian platform using Linux (experimental)
\ingroup installation
\ingroup qtsymbian
-\brief How to install Qt on the Symbian platform using Linux.
+\brief How to install Qt for the Symbian platform using Linux.
\previouspage Installation
\tableofcontents
diff --git a/doc/src/howtos/unix-signal-handlers.qdoc b/doc/src/howtos/unix-signal-handlers.qdoc
index fe01772..ca34bfb 100644
--- a/doc/src/howtos/unix-signal-handlers.qdoc
+++ b/doc/src/howtos/unix-signal-handlers.qdoc
@@ -78,7 +78,7 @@
In your Unix signal handlers, you write a byte to the \e write end
of a socket pair and return. This will cause the corresponding
QSocketNotifier to emit its activated() signal, which will in turn
- cause the appropriate Qt slott function to run.
+ cause the appropriate Qt slot function to run.
\snippet doc/src/snippets/code/doc_src_unix-signal-handlers.qdoc 3
diff --git a/doc/src/overviews.qdoc b/doc/src/overviews.qdoc
index 7b02f1a..b9bd3b4 100644
--- a/doc/src/overviews.qdoc
+++ b/doc/src/overviews.qdoc
@@ -54,7 +54,7 @@
\brief The Qt components for constructing native look & feel desktop UI's.
These pages are about Qt's traditional set of GUI components for
- building both native look ^ feel and custom UI's for the desktop
+ building both native look & feel and custom UI's for the desktop
environment. Use \l{Qt Quick} for building UI's for mobile devices.
\generatelist {related}
diff --git a/doc/src/platforms/supported-platforms.qdoc b/doc/src/platforms/supported-platforms.qdoc
index e7de4c3..31866c4 100644
--- a/doc/src/platforms/supported-platforms.qdoc
+++ b/doc/src/platforms/supported-platforms.qdoc
@@ -115,8 +115,8 @@
\o gcc (\l{http://www.scratchbox.org/}{Scratchbox)}
\row \o Windows CE 5.0 (ARMv4i, x86, MIPS)
\o MSVC 2005 WinCE 5.0 Standard (x86, pocket, smart, mipsii)
- \row \o Windows CE 6.0 (ARMv4i, x86, MIPS)
- \o MSVC 2008 WinCE 6.0 Professional
+ \row \o Windows Embedded CE 6.0 (ARMv4i, x86, MIPS)
+ \o MSVC 2008 WinCE Embedded 6.0 Professional
\row \o Maemo 5(Linux, ARM, X11)
\o gcc (\l{http://www.scratchbox.org/}{Scratchbox)}
\row \o Symbian (Symbian/S60 3.1, 3.2)
diff --git a/doc/src/template/style/style.css b/doc/src/template/style/style.css
index 3dcea96..ec0202a 100755
--- a/doc/src/template/style/style.css
+++ b/doc/src/template/style/style.css
@@ -664,6 +664,7 @@
#resultdialog.active {
display: block;
+ width:30%;
}
#resultdialog #resultclose {