diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-10-08 16:03:27 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-10-08 16:03:27 (GMT) |
| commit | e5bcddb6fecc1fb55f18f734601a3e928dc7510a (patch) | |
| tree | 4c6fd15be926b48ca7e962c51024a1bea9bae649 /doc | |
| parent | 468bd5ac176c42af310d439810bbd3bb561f5a1b (diff) | |
| parent | 3945fd75a93d790434b33c2d23add155893a82a4 (diff) | |
| download | Qt-e5bcddb6fecc1fb55f18f734601a3e928dc7510a.zip Qt-e5bcddb6fecc1fb55f18f734601a3e928dc7510a.tar.gz Qt-e5bcddb6fecc1fb55f18f734601a3e928dc7510a.tar.bz2 | |
Merge branch '4.6'
Conflicts:
tools/assistant/translations/translations_adp.pro
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/platforms/s60-introduction.qdoc | 4 | ||||
| -rw-r--r-- | doc/src/qt4-intro.qdoc | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/doc/src/platforms/s60-introduction.qdoc b/doc/src/platforms/s60-introduction.qdoc index 9f7448d..d145a82 100644 --- a/doc/src/platforms/s60-introduction.qdoc +++ b/doc/src/platforms/s60-introduction.qdoc @@ -122,8 +122,8 @@ build targets, as shown in the table below: \row \o \c QT_SIS_OPTIONS \o Options accepted by \c .sis creation. -i, install the package right away using PC suite. -c=<file>, read certificate information from a file. - Execute \c{createpackage.pl} script without any - parameters for more information about options. + Execute \c{perl createpackage.pl} for more information + about options. By default no otions are given. \row \o \c QT_SIS_TARGET \o Target for which \c .sis file is created. Accepted values are build targets listed in diff --git a/doc/src/qt4-intro.qdoc b/doc/src/qt4-intro.qdoc index 6224cd4..38f346f 100644 --- a/doc/src/qt4-intro.qdoc +++ b/doc/src/qt4-intro.qdoc @@ -661,10 +661,9 @@ See the \l{QtMultimedia Module} documentation for more information. - \section1 Classes, functions, and other items introduced in 4.6 + \section1 Classes, functions, etc new in 4.6 - Links to classes, function, and other items that were added in - 4.6. + Links to classes, functions, and other items that are new in 4.6. \sincelist 4.6 |