summaryrefslogtreecommitdiff
path: root/src/qdoc/main.cpp
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-09-051-104/+132
|\ | | | | | | | | | | | | Conflicts: src/qdoc/doc/qdoc-manual-markupcmds.qdoc Change-Id: I43e2d334a848397a2e619ad19aab66daff53d9b7
| * qdoc: Comment what's left of main() to clarify what it's doingEdward Welbourne2016-08-081-3/+5
| | | | | | | | | | Change-Id: Iaffd91fc1d6a31bc2ade50f1fad6f1d544b07f73 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
| * qdoc: sub-class command-line parser to declutter main()Edward Welbourne2016-08-081-101/+127
| | | | | | | | | | | | | | | | | | | | | | | | | | More than two thirds of main() concerned parsing the command-line arguments and settings globals, interacting minimally with the rest. So split that code out into a sub-class of the command-line parser, to make main() itself easier to read. Changed a QStringLiteral to a QLatin1String to work round an MSVC-2010 issue. Change-Id: Idd5fec280b0ce631f1d6d2a79cb59f9c4171eceb Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* | Updated license headers and license testsAntti Kokko2016-06-101-17/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | From Qt 5.7 -> tools & applications are licensed under GPL v3 with some exceptions, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new GPL-EXCEPT header instead of LGPL21 one (in those files which will be under GPL 3 with exceptions) License header tests also updated to match current headers. Change-Id: Ia6bdacaa3c5bbc9d31334e1a0cabfe502a484dc4 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | qdoc: Allow example files to be excludedTopi Reinio2016-05-121-62/+15
|/ | | | | | | | | | | | | | | | | | | | | Documentation configuration variables 'excludedirs' and 'excludefiles' had no effect on what source and image files were listed as belonging to an example. This commit fixes that, and refactors excludedirs/files handling: Remove duplicated code blocks, amd simplify the code reading the variables: - Drop checks whether an excluded directory exists - Drop conversion of native separators for excluded paths Both are unnecessary; QDoc expects '/'-separated paths for many other variables, and if an excluded dir does not exist, it won't exclude anything. Change-Id: Ie25511e20d33888653c23bb84975368317eb4306 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com> Reviewed-by: Martin Smith <martin.smith@theqtcompany.com>
* qdoc: Warn about ignored -indexdir optionMartin Smith2016-02-101-1/+4
| | | | | | | | | | | In -single-exec mode, qdoc doesn't read index files. Therefore, the -indexdir option is ignored. qdoc now warns immediately when it ignores the -indexdir option in -single-exec mode. Change-Id: I85513df04041a722bccf14ad613693f283ab0504 Task-number: QTBUG-50840 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* qdoc: Deduplicate adding a slash in both branches of an if/else.Edward Welbourne2016-01-041-3/+3
| | | | | Change-Id: I5d3f78ad0c6e9a494485a2b5dca237c839d0932a Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* qdoc: Add support for listing all examples from all modulesTopi Reinio2015-12-121-0/+7
| | | | | | | | | | | | | | | | | | | | | This commit adds a new argument for \generatelist command, which enables the generation of an 'example index' page: \generatelist annotatedexamples This will generate a set of tables; one for each module, prefixed by a header titled with the module name. The table is an annotated list (title + brief description) for each documented example. A human-readable name for each module is read from the navigation.landingpage .qdocconf variable. This name is written to / read back from the index files as 'indexTitle' attribute. Examples for modules that do not define a landing page title are listed in a single table with no accompanying header. Change-Id: Icb7fa6fb40ec9a0dfce1bf8282c8782a69ec0028 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Martin Smith <martin.smith@theqtcompany.com>
* move qdoc back to qttoolsOswald Buddenhagen2015-10-231-0/+794
we can do that now, as the bootstrap lib is now a properly exported module, and qmldevtools is now bootstrapped as well. this removes the abomination of a copy of the qml parser in qtbase. unfortunately qtbase/2422251ee5025a067b14b989153764ab36e43f10 is reverted, as qtdeclarative is still missing the respective change. this introduces no regression in discoverability or usability, as a full doc build already needed qttools - for qhelpgenerator. Change-Id: Ic9c4c9732ddf5998637b9e42e27939ba50b31479 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com> Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
View Lorry Controller Status