summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-07-1623-389/+251
|\
| * Merge remote branch 'origin/4.7' into oslo-staging-1Aaron McCarthy2010-07-164-1/+75
| |\ | | | | | | | | | | | | Conflicts: tools/qdoc3/htmlgenerator.cpp
| | * Docs: HTML comments marks so Creator can extract data efficiently.Leandro Melo2010-07-144-1/+75
| | | | | | | | | | | | Reviewed-by: Martin Smith
| * | qdoc: Removed navigation arrow that was causing display problems.Martin Smith2010-07-142-12/+19
| | | | | | | | | | | | Task-number: QTBUG-12157, QTBUG-12148, QTBUG-12146
| * | Fixing merge conflicts.Martin Smith2010-07-132-8/+8
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '4.7-upstream' into 4.7 Conflicts: doc/src/declarative/advtutorial.qdoc src/declarative/graphicsitems/qdeclarativeloader.cpp src/declarative/graphicsitems/qdeclarativetextedit.cpp src/declarative/qml/qdeclarativeengine.cpp src/declarative/util/qdeclarativexmllistmodel.cpp
| * | qdoc: Fixed several <div> elements that had the "/>" ending.Martin Smith2010-07-131-4/+4
| | |
| * | qdoc: Fixed breadcrumbs for QML examples.Martin Smith2010-07-131-6/+11
| | | | | | | | | | | | Task-number: QTBUG-11679
| * | Doc: Cleaning style and adding support for CreatorMorten Engvoldsen2010-07-094-26/+21
| | | | | | | | | | | | Note: Support for creator has been disabled. HTML-generator needs an update.
| * | Doc: fixing offline styleMorten Engvoldsen2010-07-091-7/+5
| | |
| * | Doc: Adding support for Qt Creator styleMorten Engvoldsen2010-07-093-2/+18
| | | | | | | | | | | | | | | | | | Adding a variable to the qdocconf file will now generate the docs in Creator format Reviewed-by: Martin Smith
| * | qdoc: Marked some missing declarative properties and functions as \internal.Martin Smith2010-07-091-1/+2
| | |
| * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-07-081-1/+1
| |\ \
| | * | Doc: documenting docsMorten Engvoldsen2010-07-081-1/+1
| | | |
| * | | qdoc: Fixed broken QML property links.Martin Smith2010-07-082-2/+2
| |/ / | | | | | | | | | Task-number: QTBUG-12038
| * | Doc: more cleaningMorten Engvoldsen2010-07-081-24/+3
| | |
| * | Doc: fixing escape characterMorten Engvoldsen2010-07-081-1/+1
| | |
| * | Doc: cleaning html generatorMorten Engvoldsen2010-07-081-26/+0
| | |
| * | Doc: changing index pageMorten Engvoldsen2010-07-082-7/+46
| | |
| * | Doc: fixing link to devnetMorten Engvoldsen2010-07-081-1/+1
| | |
| * | Doc: adding HTML class names and style docs to the generatorMorten Engvoldsen2010-07-081-32/+34
| | |
| * | Doc: fixing typoMorten Engvoldsen2010-07-081-3/+2
| | |
| * | qdoc: Fixed table of contents for namespace pages.Martin Smith2010-07-081-1/+2
| | | | | | | | | | | | Task-number: QTBUG-11992
| * | qdoc: Fixed a few links to QtObject (QML:QtObject)Martin Smith2010-07-073-16/+10
| | |
| * | qdoc: Removed a lot of dead code to minimize confusion.Martin Smith2010-07-072-234/+1
| | |
| * | qdoc: Fixed the case where the property and type names are the same.Martin Smith2010-07-0714-50/+61
| | | | | | | | | | | | | | | | | | Also simplified some code. Task-number: QTBUG-6340
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-07-1210-489/+253
|\ \ \ | | |/ | |/|
| * | Replace 4.6 in all .qdocconf filesKai Koehne2010-07-092-8/+8
| |/ | | | | | | Reviewed-by: David Boddie
| * qdoc: Simplified code to enable fixing of QTBUG-6340.Martin Smith2010-07-063-410/+89
| | | | | | | | | | | | Also reworded some of the text for QTBUG-11575. Task-number: QTBUG-6340, QTBUG-11575
| * Doc: fixing search script and styleMorten Engvoldsen2010-07-051-1/+1
| |
| * qdoc: Fixed type linking for QML properties (most of them).Martin Smith2010-07-053-4/+8
| | | | | | | | Task-number: QTBUG-6340
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-07-024-35/+38
| |\ | | | | | | | | | | | | Conflicts: tools/qdoc3/test/qt-html-templates.qdocconf
| | * qdoc: Fixed spacing before "default" and "read-only".Martin Smith2010-07-022-7/+8
| | | | | | | | | | | | Task-number: QTBUG-11346
| | * Doc: Adding navigation and style fixes. Also rearranging qml elementsMorten Engvoldsen2010-07-012-25/+26
| | |
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-012-1/+2
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QSslSocket::systemCaCertificates(): have one common case for all Unices Fixed QX11EmbedContainer. Improved a bit detection of a touch screen on Windows. qdoc: Fixed invalid format in the html header. link glu32 before opengl32 Stopped trying to output QML property list in 2 columns
| | | * qdoc: Fixed invalid format in the html header.Martin Smith2010-07-011-1/+1
| | | | | | | | | | | | | | | | Task-number: QTBUG-11803
| | | * Stopped trying to output QML property list in 2 columnsMartin Smith2010-06-301-0/+1
| | | | | | | | | | | | | | | | Task-number: QTBUG-11009, QTBUG-11096
| | * | update qml.qch to version 4.7mae2010-06-291-2/+2
| | |/ | | | | | | | | | | | | | | | | | | This fixes a version clash when both qt.qch and qml.qch are loaded into Qt Creator Done-with: Daniel Molkentin
| * | qdoc: Added a solution for creating tables of contents for manuals.David Boddie2010-07-023-34/+112
| | | | | | | | | | | | Reviewed-by: Trust Me
| * | Doc: Fixed markup.David Boddie2010-06-301-1/+1
| |/ | | | | | | Reviewed-by: Trust Me
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-06-3014-173/+517
|\ \ | |/ | | | | | | Conflicts: tools/qdoc3/test/qt-html-templates.qdocconf
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-06-289-77/+131
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-06-288-86/+295
| | |\
| | * \ 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
generated by cgit v0.12 at 2024-10-26 18:26:39 (GMT)