diff options
author | David Boddie <dboddie@trolltech.com> | 2009-05-26 14:08:59 (GMT) |
---|---|---|
committer | Jason McDonald <jason.mcdonald@nokia.com> | 2009-05-27 02:59:29 (GMT) |
commit | 0db22fbf50c5a7d0908772d7183594c5b11edb02 (patch) | |
tree | da379be3e520791f14a880813f8d50aa1c643bf4 /doc/src | |
parent | 3a0f0a3301229cf20c45a2cc6d3094470d98378e (diff) | |
download | Qt-0db22fbf50c5a7d0908772d7183594c5b11edb02.zip Qt-0db22fbf50c5a7d0908772d7183594c5b11edb02.tar.gz Qt-0db22fbf50c5a7d0908772d7183594c5b11edb02.tar.bz2 |
Doc: Updated the list of tools to include makeqpf and qvfb.
Reviewed-by: Marcel Schuette
(cherry picked from commit f61056a556259c12a6de23f12756e45737345111)
Diffstat (limited to 'doc/src')
-rw-r--r-- | doc/src/emb-fonts.qdoc | 2 | ||||
-rw-r--r-- | doc/src/emb-makeqpf.qdoc | 9 | ||||
-rw-r--r-- | doc/src/tools-list.qdoc | 6 |
3 files changed, 9 insertions, 8 deletions
diff --git a/doc/src/emb-fonts.qdoc b/doc/src/emb-fonts.qdoc index 81534e3..109680c 100644 --- a/doc/src/emb-fonts.qdoc +++ b/doc/src/emb-fonts.qdoc @@ -131,7 +131,7 @@ The Qt Prerendered Font (QPF2) is an architecture-independent, light-weight and non-scalable font format specific to \l{Qt for Embedded Linux}. - Nokia provides the cross-platform \c makeqpf tool, included in the + Nokia provides the cross-platform \l makeqpf tool, included in the \c tools directory of both \l {Qt} and \l{Qt for Embedded Linux}, which allows generation of QPF2 files from system fonts. diff --git a/doc/src/emb-makeqpf.qdoc b/doc/src/emb-makeqpf.qdoc index 863748f..e7cb1ce 100644 --- a/doc/src/emb-makeqpf.qdoc +++ b/doc/src/emb-makeqpf.qdoc @@ -44,7 +44,10 @@ \title makeqpf \ingroup qt-embedded-linux - \c makeqpf is not part of Qt 4. However, Qt 4 can still read QPF - files generated by Qt 2 or 3. To generate QPF files, use makeqpf from Qt 2 - or 3. + \c makeqpf is a tool to generate pre-rendered fonts in QPF2 format for use on Embedded Linux. + + Qt 4 can read files in QPF2 format in addition to QPF files generated by older versions of + \c makeqpf from Qt 2 or 3. + + \sa {Qt for Embedded Linux Fonts} */ diff --git a/doc/src/tools-list.qdoc b/doc/src/tools-list.qdoc index 644958c..d8ced5b 100644 --- a/doc/src/tools-list.qdoc +++ b/doc/src/tools-list.qdoc @@ -58,12 +58,10 @@ \o Translate applications to reach international markets. \row \o \l{qmake Manual}{qmake} \o Create makefiles from simple platform-independent project files (\c .pro files). - \omit - \row \o \l{emb-qvfb.html}{qvfb} + \row \o \l{The Virtual Framebuffer}{qvfb} \o Run and test embedded applications on the desktop. - \row \o \l{emb-makeqpf.html}{makeqpf} + \row \o \l{makeqpf} \o Create pre-rendered fonts for embedded devices. - \endomit \row \o \l{moc}{Meta-Object Compiler (moc)} \o Generate meta-object information for QObject subclasses. \row \o \l{User Interface Compiler (uic)} |