summaryrefslogtreecommitdiffstats
path: root/src/tools/qdoc/qdoc.pro
Commit message (Collapse)AuthorAgeFilesLines
* qdoc is moving back to qttoolsOswald Buddenhagen2015-10-221-99/+0
| | | | | | Change-Id: Icb5abd32a1cbc3e8d876341c877e8d2a963c0e25 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* use Xml stream reader to read qdoc index filesLars Knoll2015-07-241-2/+1
| | | | | | | | | We get rid of the last usage of QDom and the old xml parser in our build tools, and it makes parsing of index files a lot faster. Change-Id: Iccf01a4a73cc74a77806470fb4c4625f5331a7be Reviewed-by: Martin Smith <martin.smith@digia.com>
* qdoc: Remove support for DITA XMLMartin Smith2015-01-211-2/+0
| | | | | | | | This update makes removes Qdoc's DITA XML generator. Change-Id: Ibcfd013ace00e56a23268a2a5d850e6c9ea093d0 Task-number: QTBUG-43174 Reviewed-by: Martin Smith <martin.smith@digia.com>
* Make qtbase compile with QT_NO_DOMTasuku Suzuki2014-01-101-0/+1
| | | | | Change-Id: I98bef84ca9bf86bf7dddd3ca2a3d8210a8e46a16 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Make qtbase compile with QT_NO_XMLSTREAMWRITERTasuku Suzuki2014-01-101-0/+5
| | | | | Change-Id: I6d2447ba0875117e8a50d1aa3133bd5ea098d51a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Make qtbase compile with QT_NO_TRANSLATIONTasuku Suzuki2013-06-181-1/+0
| | | | | Change-Id: Iaa52ba41218b3ec8f36f0052230e0c2cc31c3ba5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* make bootstrapping of qdoc optionalOswald Buddenhagen2013-04-031-1/+2
| | | | | | | the weird QLibraryInfo dependency is gone. Change-Id: Iebaa5af6bc529999a2415b2ce3d2a5dca362dd5a Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* add qcryptographichash to bootstrap libOswald Buddenhagen2013-04-031-4/+3
| | | | | | | needed to make qdoc bootstrapping optional Change-Id: Ie630d129ed038fd90078197588a6df723eddf553 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* update qml parser to current version from qtdeclarativeOswald Buddenhagen2013-03-141-1/+1
| | | | | Change-Id: Ic623614aa3c63197e44bf1ae04001997fe7deaac Reviewed-by: Martin Smith <martin.smith@digia.com>
* don't bootstrap tools when not necessaryOswald Buddenhagen2013-03-141-0/+1
| | | | | | | | bootstrapping is only necessary if we are cross-compiling or have a circular build dependency. Change-Id: I17244457652ca9d4fc797043e57070c2ae3ee5d1 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Compile only the SHA-1 code into qdocThiago Macieira2013-02-231-1/+2
| | | | | | | | | There's no need to compile the other codecs if they never get used. It's possible that a whole-program optimisation would remove the dead code away, but it's not very likely. Change-Id: I75d7618c174566beec2fab44f60a9f7120133775 Reviewed-by: Richard J. Moore <rich@kde.org>
* Move TR_EXCLUDE to qdoc.pro.Friedemann Kleint2013-02-131-0/+2
| | | | | | | | It does not have any effect in a SUBDIRS-type .pro-file. Fixes 42a6d405e464944bd48a5ebdd6ed9f0b7feb3b1d . Change-Id: If2eafacecfd69b916861bf4b0afddb62628d720f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Doc: Made QDoc Manual use Qt 5's qdocJerome Pasion2013-02-071-16/+1
| | | | | | | | | | | | -removed extra qdocconf and files -"make docs" using QMAKE_DOCS -installs the documentation in QT_INSTALL_DOCS -updated title of the manual to "QDoc Manual" -modified listing of contents in Assistant Change-Id: I22f93c0903c5e672a0e7efa83bf3f592658be66d Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* remove obsolete DEPENDPATH assignmentsOswald Buddenhagen2012-12-171-3/+0
| | | | | | | | qmake now add CONFIG+=depend_includepath by default, making manual DEPENDPATH setup unnecessary. Change-Id: Ie57cf05c369e21b5b9e099b6ce9be4f75da1508f Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* make qt_tool support building bootstrapped toolsOswald Buddenhagen2012-11-161-7/+1
| | | | | | | | | | as a "side effect", this fixes the build of bootstrapped tools when doing a debug build under msvc: qt.prf would add CONFIG+=release after default_post.prf already loaded debug.prf. Change-Id: Idd17cf28d358950fd90bb18ca7a8d67e06953bc1 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* remove pointless TARGET assignmentsOswald Buddenhagen2012-11-161-1/+0
| | | | | | | TARGET defaults to the project file's basename Change-Id: I0cd204ae6559e6c51d3c987bc38ae372e2b4a3dd Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* add (parts of) QtXml to the bootstrap libOswald Buddenhagen2012-11-081-9/+3
| | | | | | | | we bootstrap it anyway (as qdoc already needed it). now lrelease will also need it. Change-Id: I5117634448368e18d6cf5540d678e039a66c7260 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* compile bootstrap lib with QT_NO_TRANSLATIONOswald Buddenhagen2012-11-081-2/+0
| | | | | Change-Id: Ie0d65d69dd924f0815e1214adc4598e0e1b3b8f4 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Generate a proper static QtBootstrap moduleOswald Buddenhagen2012-11-081-2/+1
| | | | | | | | | | | Making a properly installed libQtBootstrap simplifies our tools build process a little and in addition allows other comand line tools to use the bootstrap lib and link against it. Initial-version-by: Lars Knoll Change-Id: Iddf4568a5505bc24898ec1abf7e7022e19f0a454 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Centralize place where we ensure qdoc is built before generating docsTor Arne Vestbø2012-10-101-5/+0
| | | | | Change-Id: Ie0220d3c76990f6052edcd8c738e4e2807f35c71 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* qdoc: retrying More refactoring of qdoc data structuresMartin Smith2012-09-261-0/+4
| | | | | | | | | | | This commit is the second phase of a significant overhaul of qdoc. Two new classes, QDocIndexFiles, and QDocTagFiles, are added to encapsulate the creation and use of the qdoc index files, and the creation of the qdoc tag file. Change-Id: I94651b10628e535ea7b26bd8256037cd819ccea7 Reviewed-by: Martin Smith <martin.smith@digia.com>
* qdoc: Refactoring of qdoc data structuresMartin Smith2012-09-141-0/+2
| | | | | | | | | | | | | | | | | | This commit is the beginning of a significant overhaul of qdoc. A new class, QDocDatabase, is added, which will eventually encapsulate all the data structures used by qdoc. In this commit, the Tree class is made private and only accessible from QDocDatabase. Several maps structures are also moved into QDocDatabase from other classes. Much dead code and unused parameters were removed. Further simplification will follow. Change-Id: I237411c50f3ced0d2fc8d3b0fbfdf4e55880f8e9 Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org> Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
* QDoc: Write SHA1 of .qhp to file.Casper van Donderen2012-08-311-0/+1
| | | | | | | | | QDoc should generate a SHA1 hash of the .qhp file to be able to use that file as a search index. The idea is that we can use the hash as an identifier to check if the search index was updated. Change-Id: Ifd19571bcebf7d735ef452dca6c046a14fedc0e2 Reviewed-by: Martin Smith <martin.smith@nokia.com>
* QDoc: Fix make commands for QDoc manual.Casper van Donderen2012-07-191-4/+4
| | | | | Change-Id: I55c3eae43928e87a0aa470127f9877741391deee Reviewed-by: Martin Smith <martin.smith@nokia.com>
* don't refer to module versions during bootstrapOswald Buddenhagen2012-06-191-2/+2
| | | | | | | | | | once we auto-generate the pris while building their respective modules, the versions won't be available during bootstrap yet. however, as these are core modules, their version is locked to the global $$QT_VERSION anyway, so just use that. Change-Id: I092f5e7d4dfe99c03e0df71f9409cac9be9f2297 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* properly declare the host tools as such in the project filesOswald Buddenhagen2012-06-191-0/+1
| | | | | | | don't mess with the qmake cmdline args any more. Change-Id: I399d87145d31d25e29951b6acd96387a3c7282f0 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Remove the HAVE_DECLARATIVE define.Stephen Kelly2012-05-101-1/+0
| | | | | | | It is unconditionally defined. Change-Id: I8961805eab984dd7331b7ce3dc228a031193892b Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Properly implement a 'make docs' target for subdirs and apps/libsMarius Storm-Olsen2012-05-091-0/+6
| | | | | | | | | | | | | | Only call qdoc for projects which sets the QMAKE_DOCS variable to point to a qdocconf file. Exclude examples/ and tests/ from the qdoc run, by adding no_docs_target to CONFIG for those projects. Change-Id: Ic856c8f19db59309302d0602b3e99735609e525a Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* QDoc: Remove all occurences of 'qdoc3' in source.Casper van Donderen2012-05-021-5/+5
| | | | | Change-Id: I7d4e3238a9233d6aab32cc7a3c5a883e718113d5 Reviewed-by: Martin Smith <martin.smith@nokia.com>
* qdoc: Merge PageGenerator into Generator class.Casper van Donderen2012-03-201-2/+0
| | | | | | | | | | | This change also sorts all functions in Generator by alphabet and moves the implementation of the GenerateQmlInheritedBy function to the Generator class, since the implementation in both the DITA and HTML generators was the same. Task-number: QTBUG-24833 Change-Id: I44588079159e03b7ff7549e5478babb1aabdaf1b Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* bootstrap: remove QtXml dependencyGiuseppe D'Angelo2012-03-141-3/+10
| | | | | | | | | | Only qdoc is now using QtXml classes, so just add them to qdoc.pro and drop them from the bootstrap library. Change-Id: I821839396141d1d7a2ada565a513aa46c54c9620 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Move qdoc into qtbase and bootstrap itLars Knoll2012-03-081-0/+114
We need qdoc in qtbase to be able to properly modularize our documentation and build it when building the different Qt modules. qdoc does contain a copy of the qml parser from qmldevtools, but this is the lesser evil compared to how we are currently forced to genereate our docs (and the fact that no developer can run qdoc and check the docs for their module). Change-Id: I9f748459382a11cf5d5153d1ee611d7a5d3f4ac1 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com> Reviewed-by: Martin Smith <martin.smith@nokia.com>