summaryrefslogtreecommitdiff
path: root/qtdoc.pro
Commit message (Collapse)AuthorAgeFilesLines
* Doc: Remove qtdemo exampleRainer Keller2014-09-171-1/+1
| | | | | | | | | | QtDemo was unmaintained for several years and did not work successfully in the current state. Task-number: QTBUG-38922 Task-number: QTBUG-32906 Change-Id: I43fd666a0977793ecbb092573fb469ecfbed6bc7 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* Enabling "make docs"Jerome Pasion2012-11-081-18/+0
| | | | | | | | It was disabled for the Beta 2 docs, but for the final documentation, it is needed. Change-Id: I6a4ebac397fdfb7e21ea64f73731d02893053ba5 Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
* Merge branch 'master' of ssh://codereview.qt-project.org/qt/qtdoc into newdocsJerome Pasion2012-11-021-1/+19
|\ | | | | | | Change-Id: Ib7d279c6e99b28975ec90b7bc2affe8bd60f4100
| * Prevent 'make docs' (from qt5.git) from generating monolithic docsTor Arne Vestbø2012-10-121-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't want to recurse into the qtdoc repo and do a full monolithic doc build as part of a modularized docs build of qt5.git. At some point we'll have to factor out the global/generic docs out of this repo into a qglobaldocs repo, or just throw away all the monotholitic stuff and keep the generic docs here. Change-Id: I646350ca2dea0756877179b39519616ef7e173ff Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Johanna Äijälä <johanna.aijala@digia.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* | Make the qtdoc repo part of the modularized buildTor Arne Vestbø2012-10-161-19/+0
| | | | | | | | | | | | | | | | | | | | | | | | The monolithic build is now partially removed, but there's still a lot of cruft left that we'll remove once we know what we need or not need. This introduces a bunch of qdoc warnings for examplee documentation that live in the qdoc repo, but that references an example that lives in the module. These example docs should be moved to the corresponding module. Change-Id: I15f9f9087f1e96786ce2a49a7192f1015cb192db Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* | Prevent 'make docs' (from qt5.git) from generating monolithic docsTor Arne Vestbø2012-10-121-3/+1
|/ | | | | | | | | | | | We don't want to recurse into the qtdoc repo and do a full monolithic doc build as part of a modularized docs build of qt5.git. At some point we'll have to factor out the global/generic docs out of this repo into a qglobaldocs repo, or just throw away all the monotholitic stuff and keep the generic docs here. Change-Id: I646350ca2dea0756877179b39519616ef7e173ff Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* clean up determination of build rootOswald Buddenhagen2012-06-281-10/+1
| | | | | | | | | use the new $$shadowed() function instead of the arcane trickery. Change-Id: I4e1db28c71559c0ce9708e5a743f44bed24910fc Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Mark Brand <mabrand@mabrand.nl> Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Remove qdoc3 from the qtdoc repo.Casper van Donderen2012-03-131-1/+1
| | | | | Change-Id: I0a5df9106940442187609fa02f2e27c532957fec Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Run qmake at "make docs" timeLincoln Ramsay2011-10-031-2/+31
| | | | | | | | | | | | | | | | | doc.pri requires QT.xxx.variable variables but they are not set the first (and normally only) time qmake parses doc.pri. As a result, you can't build docs without first manually running "make qmake". This change adds an explicit dependency such that all of the doc commands (docs, online_docs, qch_docs, dita_docs) first force qmake to run and process doc.pri again. This ensures that the QT.xxx.variable variables have the appropriate values. Change-Id: I688c432284605e9f56e7597f564f1c50e972f059 Reviewed-on: http://codereview.qt-project.org/5779 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Alex <alex.blasche@nokia.com>
* Disabled qtdemo building for the time being.David Boddie2011-07-011-1/+1
| | | | | | | Change-Id: I90fb041e14a05d8fc6c7633f93be591fac903f13 Reviewed-on: http://codereview.qt.nokia.com/802 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
* Initial import from the monolithic Qt.Qt by Nokia2011-04-271-0/+3
This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
View Lorry Controller Status