summaryrefslogtreecommitdiffstats
path: root/mkspecs/features/qt_docs.prf
Commit message (Collapse)AuthorAgeFilesLines
* Pass the include paths to qdocOlivier Goffart2017-12-081-3/+3
| | | | | Change-Id: Id97df15863e8499d879079b0df705c78c04ca521 Reviewed-by: Martin Smith <martin.smith@qt.io>
* Automatically generate code attribution documentationKai Koehne2016-08-101-1/+14
| | | | | | | | | | | Let the qtattributionsscanner tool generate a .qdoc file in the build directory that contains code attributions for this qdoc module. Task-number: QTBUG-55139 Change-Id: Ic7532c9a7c092f552c36e21ee6cbebdd0107689b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* fix docs creation in debug_and_release buildsOswald Buddenhagen2016-01-081-8/+15
| | | | | | | | | | | | qtAddToolEnv() (via qtPrepareTool()) does not write the tool wrapper scripts during build passes, while qt_docs.prf (which calls it for qdoc and qhelpgenerator) was loaded only during build passes. the consequence was that the makefiles tried calling non-existent scripts. amends 5418d77a1, sort of. Change-Id: I64ab573495ca339be4c7b5e8c6848b298b6cb605 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* fix doc builds in paths with spacesOswald Buddenhagen2016-01-081-7/+7
| | | | | | Change-Id: Ie76411e3a4a8df69ff9b12a18480d1a987fac639 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
* don't call qtAddToolEnv() directlyOswald Buddenhagen2015-12-151-11/+12
| | | | | | | | qtPrepareTool() does it anyway, so this saves repeated manipulations. for now, this is just nicer, but soon it will be a requirement. Change-Id: I5184e0e4597c6d5a4d7dd4cc4d81e7f742a79fc8 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* pass (some) index dirs also during -prepare phaseOswald Buddenhagen2014-06-051-1/+15
| | | | | | | | | | | | qdoc uses the indexes as "precompiled headers" to obtain type info necessary to properly parse sources. the indexes needed are the ones the module actually depends on (publically). Change-Id: I6aad0b511d2534d584f7947c8d800300eede94ff Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
* don't check for doc/ dirs' existenceOswald Buddenhagen2014-06-051-2/+1
| | | | | | | | | | | | | | | | | the doc/ dirs in the build dir won't be created until the docs have been built, so of course checking whether they are there during the qmake phase is counterproductive. this also means that we'll get some complaints about non-existing directories (for repos that don't create any docs). there is no reasonable way to query qmake which repos are affected, and writing shell-specific code to query it at make time seems a bit overengineered. Task-number: QTBUG-38862 Change-Id: Ie0588e75bfc39718fffd46f0df6785428e396eb2 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
* ensure that there is always an -indexdir argumentOswald Buddenhagen2014-06-051-3/+7
| | | | | | | | | | | | | | even if we are not doing a top-level build, we still need to specify an index dir. that may be the install dir or the qtbase build dir, depending on whether we are building against an installed prefix build or a non-prefix build (building against non-installed prefix builds outside a top-level build is inherently impossible). Task-number: QTBUG-35596 Change-Id: Ia37d429855480d3bfe36b7ee29e087029861bfc5 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* fix doc references to webkitOswald Buddenhagen2014-05-131-2/+3
| | | | | | | | | | | | we can't derive the doc index paths from QMAKEMODULES, as the mkspecs dir may not live at the repo's top level. instead, explicitly announce the repo's top level build dirs in QTREPOS, and use that accordingly. Task-number: QTBUG-38862 Change-Id: I643ad2bf63c8fca0ffc44ce3457dbe8a16dcab07 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Merge branch 'stable' into devSergio Ahumada2013-07-111-4/+5
|\ | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/mac/pbuilder_pbx.cpp src/corelib/json/qjsonwriter.cpp src/corelib/kernel/qeventdispatcher_blackberry.cpp src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm Change-Id: I24df576c4cbd18fa51b03122f71e32bb83b9028f
| * don't pass -indexdir during prepare_docs phaseOswald Buddenhagen2013-07-081-4/+5
| | | | | | | | | | | | | | | | | | | | | | the forward-referenced directories don't exist yet, so we get pointless warnings. in fact, this is why we do a multi-pass build in the first place, and consequently using indexes during the first pass is illogical. Task-number: QTBUG-32152 Change-Id: I66bf6b43238827e87cb8bf6932d581b808c1032d Reviewed-by: Martin Smith <martin.smith@digia.com>
* | don't copy/symlink doc/global to build dirOswald Buddenhagen2013-06-121-1/+1
|/ | | | | | | | | instead, use the files directly from the source dir. Change-Id: I03b728c66de6e03cade6dc153dcc78cea8e3f606 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* move the setup of QT_INSTALL_DOCS from qdoc to qt_docs.prfOswald Buddenhagen2013-04-021-1/+3
| | | | | | | | | | this is a qt specific option and really should not be hard-coded. also, the implementation used undocumented api that is internal to the bootstrapped process, which made it impossible to de-bootstrap it. Change-Id: If706960671744e64a9a7c366437977a800a6058e Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* require modules to define their versionOswald Buddenhagen2013-03-061-3/+5
| | | | | | | | | | | | | | | otherwise they would inherit it from qtbase, which may effectively result in a lie if building against a different release. for convenience we define the version centrally per repo. qtbase is special, in that we use the version defined in qglobal.h to avoid defining it redundantly (the instance in qglobal.h is currently needed to bootstrap qmake; the configures would need some work to change this). Task-number: QTBUG-29838 Change-Id: Ie9a5b0ff0d64b69ff2d34af2f7c42d6278e957cc Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* substitute fixed version numbers in qdocconf files with variablesOswald Buddenhagen2013-02-011-0/+7
| | | | | | Change-Id: Ie57765c10a8e90d6fc74ee5a8fd84bfc7cd8bcf2 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* mark a bunch of features as internalOswald Buddenhagen2012-12-121-0/+11
| | | | | Change-Id: I5ad28827ff317985414e859263af85ceec31207c Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* don't make the doc installs depend on the regular buildOswald Buddenhagen2012-12-051-2/+2
| | | | | | | it's pretty pointless Change-Id: Icea0073683a2d949798147fba3fad5b3331b1125 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* fix doc target recursionsOswald Buddenhagen2012-12-051-1/+0
| | | | | | | | | | | | | | | | | in particular for the meta Makefiles of debug_and_release. the logic is as follows: - the meta targets ('html_docs' in prepare_docs mode, and 'docs' always) need to branch out asap, so they are implemented non-recursively in every makefile. - all other targets need to be fully recursive. the meta Makefile will recurse only into one of debug or release, depending on the configure option (it doesn't matter anyway). Change-Id: I4e3f714cdda9c3a1021743148b5ee73379e3484d Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* centralize doc target related codeOswald Buddenhagen2012-12-021-0/+45
Change-Id: I710a7f2fc3422ec8ba5b8e90bfd92e7931092ad0 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>