summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3
Commit message (Collapse)AuthorAgeFilesLines
* qdoc: Fixed code to match comments in QML files. Fixed API types.David Boddie2011-06-082-7/+6
|
* Added an additional check to workaround an issue on Windows.David Boddie2011-06-011-1/+1
| | | | | Reviewed-by: David Boddie Original-patch-by: Friedemann Kleint
* Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt into 4.8David Boddie2011-05-2482-1540/+1569
|\ | | | | | | | | | | | | | | Conflicts: src/gui/text/qrawfont.cpp src/gui/text/qtextlayout.cpp src/gui/util/qscroller.cpp src/gui/widgets/qlineedit.cpp
| * Merge remote branch 'origin/4.7' into 4.8-from-4.7Rohan McGovern2011-05-1782-1540/+1569
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/io/qfsfileengine_iterator_unix.cpp src/corelib/io/qfsfileengine_iterator_win.cpp src/network/access/qnetworkaccessdatabackend.cpp src/xmlpatterns/expr/qevaluationcache_p.h tests/auto/declarative/qdeclarativewebview/tst_qdeclarativewebview.cpp tools/assistant/tools/assistant/helpviewer_qwv.h tools/qtconfig/mainwindowbase.cpp tools/qtconfig/paletteeditoradvancedbase.cpp tools/qtconfig/paletteeditoradvancedbase.ui tools/qtconfig/previewwidgetbase.ui
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-05-1781-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 filesJyri Tahtela2011-05-1381-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.7David Boddie2011-05-139-155/+184
| | |\ \ | | | |/ | | |/|
| | | * doc: Fixed QTBUG-19226Martin Smith2011-05-121-2/+6
| | | |
| | | * doc: Fixed QTBUG-19223Martin Smith2011-05-121-1/+3
| | | |
| | | * doc: Remved debug code for QTBUG-18791Martin Smith2011-05-121-26/+0
| | | |
| | | * doc: Fixed QTBUG-18791Martin Smith2011-05-119-145/+193
| | | |
| | | * doc: Fixed a QML snippet referenceMartin Smith2011-05-091-0/+1
| | | | | | | | | | | | | | | | Also updated the Config class for reuse.
* | | | Doc: Updated version numbers and fixed minor whitespace issues.David Boddie2011-05-116-14/+15
| | | |
* | | | Merge commit 'refs/merge-requests/1220' of git://gitorious.org/qt/qt into ↵David Boddie2011-05-058-126/+138
|\ \ \ \ | |/ / / | | | | | | | | merge-requests/1220
| * | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-039-199/+297
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicslayout.cpp src/gui/graphicsview/qgraphicslayout_p.cpp
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-review into 4.7David Boddie2011-05-029-199/+297
| | |\ \ | | | |/
| | | * qdoc: Completed task QTBUG-18790Martin Smith2011-04-151-0/+2
| | | |
| | | * qdoc: Completed task QTBUG-18733Martin Smith2011-04-145-125/+74
| | | |
| | | * qdoc: Last commit before merge into master.Martin Smith2011-04-132-1/+27
| | | | | | | | | | | | | | | | | | | | Added a function to class Config to unload the qdocconf file. This is for the qdoc wizard.
| | | * qdoc: Fixed license comment.Martin Smith2011-04-081-21/+7
| | | |
| | | * qdoc: Added missing copyright noticeMartin Smith2011-04-071-0/+41
| | | |
| | | * qdoc: Updated the QDoc manual.Martin Smith2011-04-071-5/+6
| | | |
| | | * qdoc: Updated the QDoc manual.Martin Smith2011-04-071-10/+13
| | | |
| | | * qdoc: Updated the QDoc manual.Martin Smith2011-04-071-38/+127
| | | |
| | | * qdoc: Updated the QDoc manual.Martin Smith2011-04-063-24/+23
| | | |
| | | * qdoc: Fixed QTBUG-18591Martin Smith2011-04-061-0/+2
| | | |
* | | | Squashed commit of the changes from the mobile-examples repositoryDavid Boddie2011-05-046-328/+416
|/ / / | | | | | | | | | | | | (4.7-generated-declarative branch). (cherry picked from commit 539311f7b2687e3148ea695ce06fee768abe7b44)
* | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-04-091-1/+1
|\ \ \ | |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-04-081-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 typeOswald Buddenhagen2011-04-081-1/+1
| | |
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-0751-312/+13785
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: src/gui/text/qfontengine_mac.mm tests/auto/qdiriterator/tst_qdiriterator.cpp
| * | Fixed the declarative headers and includes within qdoc.David Boddie2011-04-0522-56/+56
| | |
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-04-0512-102/+346
| |\ \
| | * | qdoc: Allowed multiple values for certain metadata tags.Martin Smith2011-04-059-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 Smith2011-04-014-33/+123
| | |/
| | * qdoc: Updates to the qdoc manual.Martin Smith2011-03-301-25/+71
| | |
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-03-297-69/+116
| |\ \ | | |/
| | * qdoc: Updates to the qdoc manual.Martin Smith2011-03-281-53/+38
| | |
| | * qdoc: Added a way to exclude directories from receiving default metadataMartin Smith2011-03-281-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.7Martin Smith2011-03-2520-35/+12902
| | |\
| | * | qdoc: Added default values to config file for DITAMartin Smith2011-03-255-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 Boddie2011-03-251-12/+26
| | |/ | |/|
| * | Avoided the use of hard-coded file names.David Boddie2011-03-241-34/+70
| | |
| * | Copied the declarative parser into qdoc3 to avoid dependency issues.David Boddie2011-03-2419-1/+12832
| |/
| * qdoc: Don't wrap <image> in <fig> if in an <xref>Martin Smith2011-03-241-2/+4
| |
| * qdoc: Added <copyright>, <copyryear>, and <copyrholder>.Martin Smith2011-03-241-3/+19
| |
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Martin Smith2011-03-2416-39/+299
| |\
| | * Merge branch 'clone_4.7' into 4.7Jerome Pasion2011-03-236-6/+263
| | |\
| | | * Adopting changes from a merge with qt-doc-team repo, 4.7 branchJerome Pasion2011-03-223-3/+3
| | | |
| | | * Merge remote branch 'remotes/qt-doc-team/4.7' into 4.7Jerome Pasion2011-03-185-321/+382
| | | |\
generated by cgit v0.12 at 2024-12-12 07:50:44 (GMT)