summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Merge branch '4.7' of /home/dboddie/git/oslo-staging-1 into 4.7David Boddie2010-06-2510-122/+428
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-06-234-20/+164
| | |\ \
| | * | | Doc: Fixed whitespace issues and added missing files to lists.David Boddie2010-06-233-67/+90
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/dboddies-oslo-staging-1-qdoc ↵David Boddie2010-06-184-16/+254
| |\ \ \ \ | | | | | | | | | | | | | | | | | | into 4.7
| * | | | | qdoc: Added a workaround for QML/Qt class name clashes.David Boddie2010-06-186-10/+41
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
* | | | | | doc: Added more DITA output to the XML generatorMartin Smith2010-06-282-16/+97
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | Added cxxDefine for macros. Task-number: QTBUG-11391
* | | | | doc: Added more DITA output to the XML generatorMartin Smith2010-06-281-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added cxxVariableStorageClassSpecifierStatic. Task-number: QTBUG-11391
* | | | | Fixed copy-paste error in htmlgenerator.cppRohan McGovern2010-06-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: htmlgenerator.cpp:1893: error: stray ‘\’ in program
* | | | | Doc: fixing search bugMorten Engvoldsen2010-06-252-3/+15
| | | | |
* | | | | doc: Added more DITA output to the XML generatorMartin Smith2010-06-252-8/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Output the \variable stuff as a cxxVariable. Task-number: QTBUG-11391
* | | | | doc: Added more DITA output to the XML generatorMartin Smith2010-06-255-76/+207
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | Output Q_PROPERTY as a cxxVariable. Task-number: QTBUG-11391
* | | | doc: Added more DITA output to the XML generatorMartin Smith2010-06-223-8/+71
| | | | | | | | | | | | | | | | | | | | | | | | Some of the cxxVariable stuff for properties. Task-number: QTBUG-11391
* | | | doc: Added more DITA output to the XML generatorMartin Smith2010-06-221-1/+45
| | | | | | | | | | | | | | | | | | | | | | | | The cxxTypedef stuff for typedefs. Task-number: QTBUG-11391
* | | | Finish merge conflict.Martin Smith2010-06-225-34/+19
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7 Conflicts: tools/qdoc3/ditaxmlgenerator.cpp
| * | | | qdoc3: Build fix for regression in f321a3f2b1eAndreas Kling2010-06-222-4/+4
| | | | |
| * | | | qdoc3: Build fix for regression in e2f0e728eAndreas Kling2010-06-223-6/+5
| | |_|/ | |/| |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-06-217-41/+152
| |\ \ \
| * | | | Doc: Relicensed the documentation under the GNU FDL version 1.3.David Boddie2010-06-211-25/+11
| | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me Requested-by: Legal
* | | | | doc: Added more DITA output to the XML generatorMartin Smith2010-06-221-3/+41
| |/ / / |/| | | | | | | | | | | | | | | | | | | The rest of the cxxEnumeration stuff for enum types. Task-number: QTBUG-11391
* | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-06-213-18/+18
|\ \ \ \
| * \ \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-06-214-18/+60
| |\ \ \ \
| * | | | | Doc: Fixing bugs to style and scriptMorten Engvoldsen2010-06-213-18/+18
| | |/ / / | |/| | |
* | | | | doc: Added more DITA output to the XML generatorMartin Smith2010-06-212-5/+74
| |/ / / |/| | | | | | | | | | | | | | | | | | | cxxEnumeration stuff for enum types. Task-number: QTBUG-11391
* | | | doc: Added more DITA output to the XML generatorMartin Smith2010-06-214-18/+60
|/ / / | | | | | | | | | | | | | | | | | | More cxxFunction stuff for member functions. Function parameters and other stuff. Task-number: QTBUG-11391
* | | doc: Added more DITA output to the XML generatorMartin Smith2010-06-183-5/+47
| |/ |/| | | | | | | | | More cxxFunction stuff for member functions. Task-number: QTBUG-11391
* | doc: Added more DITA output to the XML generatorMartin Smith2010-06-172-11/+105
| | | | | | | | | | | | More cxxFunction stuff for member functions. Task-number: QTBUG-11391
* | doc: Added more DITA output to the XML generatorMartin Smith2010-06-164-16/+160
|/ | | | | | Some of the cxxFunction stuff for member functions. Task-number: QTBUG-11391
* doc: Added more DITA output to the XML generatorMartin Smith2010-06-154-446/+178
| | | | Task-number: QTBUG-11391
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-06-1131-107/+665
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-06-098-48/+495
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (34 commits) Attempt to fix build failure on Linux introduced by 09c6a81109 minor cosmetic improvements designer: add sorting in signal-slot editor window deprecate header files in $$QT_BUILD_TREE/include/Qt syncqt: change tabs to spaces I10n: Update German translations for 4.7.0 Fix a freetype link failure. Fix configure test for DirectFB Split Symbian bearer plugin into three platform specfic plugins Doc: Fixed whitespace in the other configuration file for zh_CN. Doc: Fixed whitespace in the Simplified Chinese doc configuration. Unbreak Linux build when qendian.h is included before qglobal.h Revert accidental commit of irrelevant stuff. Silly mondays.. Unbreak Linux build when qendian.h is included before qglobal.h Fix QApplication/QWidget to really take ownership of input contexts Added setting a hotspot on standard gestures Fixed GestureOverride event delivery in GraphicsView. add check-ts target to auto-asses translation completeness qt_ja_JP.ts => qt_ja.ts Fix incorrect \since tag ...
| | * Doc: Fixed whitespace in the other configuration file for zh_CN.David Boddie2010-06-071-22/+22
| | | | | | | | | | | | Reviewed-by: Trust Me
| | * Doc: Fixed whitespace in the Simplified Chinese doc configuration.David Boddie2010-06-071-26/+26
| | | | | | | | | | | | Reviewed-by: Trust Me
| | * * Add Japanese tutorial documentsTakumi ASAKI2010-06-078-0/+447
| | | | | | | | | | | | * Add Japanese hellotr example
| * | Fixed qdoc3 crash.Rohan McGovern2010-06-091-3/+3
| |/ | | | | | | Fixes "Invalid read of size 4" reported by valgrind.
| * Doc: updating imagesMorten Engvoldsen2010-06-0214-0/+0
| |
| * Doc: adding offline docs to assistant and Qt Creator. Improving small docs ↵Morten Engvoldsen2010-06-0211-57/+168
| | | | | | | | and adding highlighting
* | doc: Added DITA XML generatorMartin Smith2010-06-115-749/+772
|/ | | | Task-number: QTBUG-11391
* doc: Added DITA XML generatorMartin Smith2010-06-012-0/+5131
|
* qdoc: Added DITA XML generatorMartin Smith2010-05-313-3/+116
| | | | | At the moment, it is just like the HTML generator, but with a different class name.
* doc: Changed last breadcrumb to not be a link.Martin Smith2010-05-311-33/+16
| | | | Task-number: QTBUG-10577
* qdoc: Fixed the model/view programming page; tried a style change.Martin Smith2010-05-282-12/+3
|
* Doc: Fixing bugs in HTML generatorMorten Engvoldsen2010-05-251-4/+4
|
* qdoc: Improved class index page.Martin Smith2010-05-251-104/+89
| | | | The classes.html page will look good with the correct css.
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-05-211-2/+2
|\
| * qdoc: Fixed html error, but the problem is still there.Martin Smith2010-05-211-1/+1
| |
| * qdoc: Changed number of columns to 1. Oila!Martin Smith2010-05-211-1/+1
| |
* | Doc: design changesMorten Engvoldsen2010-05-211-7/+0
|/ | | | Fixing menus and js
* Doc: Changes to the HTMLGenerator, style and jsMorten Engvoldsen2010-05-2112-11/+20
| | | | | | Replacing tables with lists in the HTML generator Adding img to search box Moving JS from template to script files
* use qtPrepareTool for qdocOswald Buddenhagen2010-05-201-14/+1
| | | | Reviewed-by: joerg
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-05-203-10/+8
|\