Commit Graph

12 Commits

Author SHA1 Message Date
Oswald Buddenhagen
276320caac make doc generation work cleanly with both qt4 & qt5
qdoc does not expand variables in include() statements, so we need to
use separate top-level "switch" files.

Change-Id: I3152baa36cb3dee055abdc68c046b445f92e1fb9
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-02-06 09:40:03 +01:00
Leena Miettinen
75f1e8a66f Doc: fix missing snippets
Add the path to the snippets folder to the qdocconf file
and fix the paths in \snippet commands in the source file.

Change-Id: Iebabec6919b580e6d1474685777862200d314a83
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2013-01-23 12:42:07 +01:00
Eike Ziller
cf937f09d6 Avoid pulling in "Extending Manual" into Qt Creator manual.
With Qt5, qdoc finds the doc/api/*.qdoc files if the examplesdir points
to doc/, leading to the two toplevel index.html files ending up within
qtcreator.qch

Change-Id: I4ac3c1447c6924c4e292024919d52ddb97e1f8cc
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2012-12-17 12:47:49 +01:00
Leena Miettinen
836a13a97d Doc: remove space from value of project variable
This is a new qdoc requirement for the project variable in
qdocconf files.

Change-Id: I23d921bac68e3c2948c4193b08a60c756e258ccc
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
2012-05-31 14:21:29 +02:00
Oswald Buddenhagen
4a322099f5 remove double mention of $SRCDIR/src
Change-Id: I4627ba8d3be024ab982088fa58ad63c58d086280
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
2011-11-09 17:40:37 +01:00
Leena Miettinen
af2cde64a8 Doc: change doc configuration after moving files to subdirectories
Change-Id: I6df3222a92efed43ede601e3f2e6f71b75782d22
Reviewed-on: http://codereview.qt-project.org/5602
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
2011-09-27 15:51:39 +02:00
Leena Miettinen
b67c3874b7 Doc: separate MeeGo and Maemo instructions
Change-Id: I2c7a9bce7ee92c59f91fa41f732f3c90a9e100e3
Reviewed-on: http://codereview.qt-project.org/4886
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2011-09-14 17:08:32 +02:00
Leena Miettinen
63710f04ed Doc: generic Linux device target
Change-Id: I25fef3d823915c1df424da1a6ec7b683d7d38d66
Reviewed-on: http://codereview.qt.nokia.com/1323
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2011-07-08 12:13:14 +02:00
Leena Miettinen
9426bbe0ae Doc: add version numbers to the doc titles
Change-Id: I2b71cba2ab19a15a834976e3ce953e992ca4b124
Reviewed-by: David Boddie
Reviewed-on: http://codereview.qt.nokia.com/640
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-06-23 10:51:24 +02:00
Leena Miettinen
f270578cb1 Doc: added FAQ 2011-04-04 11:29:42 +02:00
con
4bf6b02989 Fix Qt Creator version in documentation again. 2011-03-07 20:38:17 +01:00
David Boddie
a20cd34863 Updated the configuration files to use the updated qdoc.
Updated qdoc to remove hard-coded dependencies on style sheets.
Simplified the offline documentation, introducing an offline.css
file to be used for documentation in Qt Creator.
2011-02-11 08:40:55 +01:00