summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-03-299-103/+155
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-03-281-53/+38
| |\
| | * qdoc: Updates to the qdoc manual.Martin Smith2011-03-281-53/+38
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Jerome Pasion2011-03-282-34/+39
| |\ \ | | |/ | |/|
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ...Qt Continuous Integration System2011-03-2742-6883/+10890
| | |\
| | * | sort out stdout vs. stderr usageOswald Buddenhagen2011-03-222-34/+39
| * | | qdoc: Added a way to exclude directories from receiving default metadataMartin Smith2011-03-281-0/+20
| * | | 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
* | | | | 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-2425-86/+429
|\ \ \
| * \ \ 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
| | |\ \
| | * | | Edited QtWebKit Guide CSS chapter. Created example links.Jerome Pasion2011-03-175-6/+262
| | * | | Adding QtWebKit Guide (BETA).Jerome Pasion2011-03-151-0/+1
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-2218-76/+159
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge remote-tracking branch 'mainline/4.7' into 4.7Oswald Buddenhagen2011-03-214-43/+109
| | |\ \ \
| | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-184-1/+39
| | | |\ \ \
| | | | * | | Added setSwitchPolicy to MeeGo graphicssystem helper API.Samuel Rødal2011-03-184-1/+39
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-164-43/+71
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | Added automatic graphicssystem switching on meego when app is minimized.Samuel Rødal2011-03-164-43/+71
| | * | | | | Bump Qt version to 4.7.4Timo Turunen2011-03-2110-29/+29
| | |/ / / /
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-152-3/+5
| | |\ \ \ \ | | | |/ / /
| | | * | | Designer: Fix a bug affecting tab reordering of promoted tab widgets.Friedemann Kleint2011-03-151-2/+4
| | | * | | Designer: Fix a bug clearing the Z-Order when adding a new widget.Friedemann Kleint2011-03-151-1/+1
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-03-1010-31/+31
| | |\ \ \ \
| | | * | | | Bump Qt version to 4.7.3Timo Turunen2011-03-0910-31/+31
| | * | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-03-081-1/+1
| | |\ \ \ \ \
| | | * \ \ \ \ Merge remote-tracking branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2011-03-081-1/+1
| | | |\ \ \ \ \
| | | | * | | | | Update copyright year to 2011.Jason McDonald2011-01-101182-1193/+1193
| | | | * | | | | embed copyright information in QtAssistantClient4.dllJoerg Bornemann2010-12-171-0/+2
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-073-1/+14
| | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | |
| | | * | | | | | Invalidate the EGL surface of QMeeGoLivePixmapData when switching to RasterPauli Nieminen2011-03-073-1/+14
| | | |/ / / / /
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-281-0/+2
| | |\ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | | * | | | | Fix qmlviewer compilation on old Symbian platformsJoona Petrell2011-02-241-0/+2
| * | | | | | | qdoc: Avoid infinite loops in table of contents generation.David Boddie2011-03-211-1/+4
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-03-184-183/+185
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Removed the documentation from the install rule.David Boddie2011-03-181-1/+1
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-03-153-205/+264
| |\ \ \ \ \ \ \
| * | | | | | | | Doc: Fixed typo.David Boddie2011-03-151-1/+1
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-03-144-14/+78
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-03-084-10/+162
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Fixed invalid HTML output.David Boddie2011-03-031-1/+1
* | | | | | | | | | qdoc: Completed metadata handling.Martin Smith2011-03-248-126/+152
| |_|_|_|/ / / / / |/| | | | | | | |
* | | | | | | | | qdoc: Added the <othermeta> element.Martin Smith2011-03-183-1/+30