Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix security problem on webpage due to bad JS | Casper van Donderen | 2011-10-21 | 4 | -47/+1 |
| | | | | Reviewed-by: Trust Me | ||||
* | Migrate addMarkUp function to QChar. | Casper van Donderen | 2011-09-08 | 1 | -9/+9 |
| | | | | Reviewed-by: Martin Smith | ||||
* | Fix assert error on Windows with a negative char. | Casper van Donderen | 2011-09-02 | 1 | -4/+4 |
| | | | | | Reviewed-by: Denis Dzyubenko Fixes: QTBUG-20228 | ||||
* | Added an additional check to workaround an issue on Windows. | David Boddie | 2011-08-30 | 1 | -1/+1 |
| | | | | | | | | | Reviewed-by: David Boddie Original-patch-by: Friedemann Kleint (cherry picked from commit 8b1654ec6a892e84c1654c9196e80461ee6e92fa) (cherry picked from commit d62bb74d329b6ee5f6c52ac26e11bfe9a27f56a0) Reapplied after bad v4.7.4 merge | ||||
* | Modified \since command behavior slightly to handle project and version. | David Boddie | 2011-08-30 | 9 | -202/+174 |
| | | | | | | | | | | (The since argument can contain a project name and version, defaulting to the qdoc project if only a version number is specified.) Refactored common code into the Generator class. Fixed \sincelist HTML generation for tables containing only one item. (cherry picked from commit 6a2f18140bbc41207eb2f5e2323b699600d89606) Reapplied after bad v4.7.4 merge | ||||
* | qdoc: Fixed QTBUG-19338 | Martin Smith | 2011-08-30 | 2 | -5/+11 |
| | | | | | | (cherry picked from commit 1ea0e706981006c48ad16a1ff8051df03610f20b) Reapplied after bad v4.7.4 merge | ||||
* | don't crash when destroying children | Konstantin Ritt | 2011-08-22 | 1 | -1/+2 |
| | | | | | | this was uncovered by my don't-detach patch. Reviewed-by: ossi | ||||
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵ | Qt Continuous Integration System | 2011-05-17 | 81 | -1385/+1385 |
|\ | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Updating file with CRLF line endings for the updated header Fix a regression in QList::mid() update gitignore remove -fno-stack-protector Fix make confclean Update licenseheader text in source files | ||||
| * | Update licenseheader text in source files | Jyri Tahtela | 2011-05-13 | 81 | -1385/+1385 |
| | | | | | | | | | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me | ||||
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | David Boddie | 2011-05-13 | 9 | -155/+184 |
|\ \ | |/ |/| | |||||
| * | doc: Fixed QTBUG-19226 | Martin Smith | 2011-05-12 | 1 | -2/+6 |
| | | |||||
| * | doc: Fixed QTBUG-19223 | Martin Smith | 2011-05-12 | 1 | -1/+3 |
| | | |||||
| * | doc: Remved debug code for QTBUG-18791 | Martin Smith | 2011-05-12 | 1 | -26/+0 |
| | | |||||
| * | doc: Fixed QTBUG-18791 | Martin Smith | 2011-05-11 | 9 | -145/+193 |
| | | |||||
| * | doc: Fixed a QML snippet reference | Martin Smith | 2011-05-09 | 1 | -0/+1 |
| | | | | | | | | Also updated the Config class for reuse. | ||||
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-review into 4.7 | David Boddie | 2011-05-02 | 9 | -199/+297 |
|\ \ | |/ | |||||
| * | qdoc: Completed task QTBUG-18790 | Martin Smith | 2011-04-15 | 1 | -0/+2 |
| | | |||||
| * | qdoc: Completed task QTBUG-18733 | Martin Smith | 2011-04-14 | 5 | -125/+74 |
| | | |||||
| * | qdoc: Last commit before merge into master. | Martin Smith | 2011-04-13 | 2 | -1/+27 |
| | | | | | | | | | | Added a function to class Config to unload the qdocconf file. This is for the qdoc wizard. | ||||
| * | qdoc: Fixed license comment. | Martin Smith | 2011-04-08 | 1 | -21/+7 |
| | | |||||
| * | qdoc: Added missing copyright notice | Martin Smith | 2011-04-07 | 1 | -0/+41 |
| | | |||||
| * | qdoc: Updated the QDoc manual. | Martin Smith | 2011-04-07 | 1 | -5/+6 |
| | | |||||
| * | qdoc: Updated the QDoc manual. | Martin Smith | 2011-04-07 | 1 | -10/+13 |
| | | |||||
| * | qdoc: Updated the QDoc manual. | Martin Smith | 2011-04-07 | 1 | -38/+127 |
| | | |||||
| * | qdoc: Updated the QDoc manual. | Martin Smith | 2011-04-06 | 3 | -24/+23 |
| | | |||||
| * | qdoc: Fixed QTBUG-18591 | Martin Smith | 2011-04-06 | 1 | -0/+2 |
| | | |||||
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵ | Qt Continuous Integration System | 2011-04-08 | 1 | -1/+1 |
|\ \ | |/ |/| | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: make -markuntranslated work without -idbased fix conditional on shell type | ||||
| * | fix conditional on shell type | Oswald Buddenhagen | 2011-04-08 | 1 | -1/+1 |
| | | |||||
* | | Fixed the declarative headers and includes within qdoc. | David Boddie | 2011-04-05 | 22 | -56/+56 |
| | | |||||
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | David Boddie | 2011-04-05 | 12 | -102/+346 |
|\ \ | |||||
| * | | qdoc: Allowed multiple values for certain metadata tags. | Martin Smith | 2011-04-05 | 9 | -44/+152 |
| | | | | | | | | | | | | | | | Also output mainters for classes in the HTML output, if there are maintainers listed. | ||||
| * | | qdoc: modified \include to take a 2nd arg, snippet id. | Martin Smith | 2011-04-01 | 4 | -33/+123 |
| |/ | |||||
| * | qdoc: Updates to the qdoc manual. | Martin Smith | 2011-03-30 | 1 | -25/+71 |
| | | |||||
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | David Boddie | 2011-03-29 | 7 | -69/+116 |
|\ \ | |/ | |||||
| * | qdoc: Updates to the qdoc manual. | Martin Smith | 2011-03-28 | 1 | -53/+38 |
| | | |||||
| * | qdoc: Added a way to exclude directories from receiving default metadata | Martin Smith | 2011-03-28 | 1 | -0/+20 |
| | | | | | | | | But it is ifdefed out because I think we won't use it. | ||||
| * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | Martin Smith | 2011-03-25 | 20 | -35/+12902 |
| |\ | |||||
| * | | qdoc: Added default values to config file for DITA | Martin Smith | 2011-03-25 | 5 | -16/+58 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also added the handling of these default values: dita.metadata.default.author = Qt Development Frameworks dita.metadata.default.permissions = all dita.metadata.default.publisher = Nokia dita.metadata.default.copyryear = 2011 dita.metadata.default.copyrholder = Nokia dita.metadata.default.audience = programmer | ||||
* | | | Removed some links and prettified others. | David Boddie | 2011-03-25 | 1 | -12/+26 |
| |/ |/| | |||||
* | | Avoided the use of hard-coded file names. | David Boddie | 2011-03-24 | 1 | -34/+70 |
| | | |||||
* | | Copied the declarative parser into qdoc3 to avoid dependency issues. | David Boddie | 2011-03-24 | 19 | -1/+12832 |
|/ | |||||
* | qdoc: Don't wrap <image> in <fig> if in an <xref> | Martin Smith | 2011-03-24 | 1 | -2/+4 |
| | |||||
* | qdoc: Added <copyright>, <copyryear>, and <copyrholder>. | Martin Smith | 2011-03-24 | 1 | -3/+19 |
| | |||||
* | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | Martin Smith | 2011-03-24 | 16 | -39/+299 |
|\ | |||||
| * | Merge branch 'clone_4.7' into 4.7 | Jerome Pasion | 2011-03-23 | 6 | -6/+263 |
| |\ | |||||
| | * | Adopting changes from a merge with qt-doc-team repo, 4.7 branch | Jerome Pasion | 2011-03-22 | 3 | -3/+3 |
| | | | |||||
| | * | Merge remote branch 'remotes/qt-doc-team/4.7' into 4.7 | Jerome Pasion | 2011-03-18 | 5 | -321/+382 |
| | |\ | |||||
| | * | | Edited QtWebKit Guide CSS chapter. Created example links. | Jerome Pasion | 2011-03-17 | 5 | -6/+262 |
| | | | | | | | | | | | | | | | | Reviewed-by: David Boddie | ||||
| | * | | Adding QtWebKit Guide (BETA). | Jerome Pasion | 2011-03-15 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | Added images, new doc build configurations, and example code. | ||||
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7 | David Boddie | 2011-03-22 | 9 | -29/+29 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/declarativeui.qdoc doc/src/declarative/dynamicobjects.qdoc doc/src/declarative/elements.qdoc doc/src/examples/qml-examples.qdoc |