summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Merge earth-team into origin/master'Olivier Goffart2011-04-1258-318/+13797
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into mast...Qt Continuous Integration System2011-04-092-1/+4
| |\
| | * Designer: Allow promoted QWidget's to be buddies.Friedemann Kleint2011-04-081-1/+3
| | * Designer: Specify 'notr' attribute for buttongroup name.Friedemann Kleint2011-04-081-0/+1
| * | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-04-092-2/+2
| |\ \
| | * \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-04-092-2/+2
| | |\ \
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-04-082-2/+2
| | | |\ \
| | | | * | make -markuntranslated work without -idbasedOswald Buddenhagen2011-04-081-1/+1
| | | | * | fix conditional on shell typeOswald Buddenhagen2011-04-081-1/+1
| * | | | | Merge remote branch 'qa-review/master' into qa-staging-masterRohan McGovern2011-04-072-2/+2
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Merge qt/qt.git master into qa-team-masterRohan McGovern2011-03-24201-17423/+9824
| | |\ \ \ \
| | * | | | | Update copyright year to 2011.Jason McDonald2011-01-101236-1246/+1246
| * | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-0753-313/+13789
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-071-0/+3
| | |\ \ \ \ \
| | | * | | | | QmlViewer: Enable remote qml debuggingKai Koehne2011-04-061-0/+3
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ...Qt Continuous Integration System2011-04-0634-145/+357
| | |\ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | | * | | | | 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
| | | | * | | | | qdoc: modified \include to take a 2nd arg, snippet id.Martin Smith2011-04-014-33/+123
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-03-299-103/+155
| | | |\ \ \ \ \ \
| | | * | | | | | | Removed some links and prettified others.David Boddie2011-03-251-12/+26
| | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ...Qt Continuous Integration System2011-04-0137-243/+13504
| | |\ \ \ \ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | |
| | | * | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Martin Smith2011-03-302-34/+39
| | | |\ \ \ \ \ \ \ | | | | | |/ / / / / | | | | |/| | | | |
| | | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-03-281-53/+38
| | | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Jerome Pasion2011-03-282-34/+39
| | | | |\ \ \ \ \ \ \
| | | * | | | | | | | | qdoc: Updates to the qdoc manual.Martin Smith2011-03-301-25/+71
| | | | |_|/ / / / / / | | | |/| | | | | | |
| | | * | | | | | | | 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
| | | * | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Martin Smith2011-03-2520-35/+12902
| | | |\ \ \ \ \ \ \ | | | | | |/ / / / / | | | | |/| | | | |
| | | | * | | | | | 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: Added default values to config file for DITAMartin Smith2011-03-255-16/+58
| | | |/ / / / / /
| | | * | | | | | 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
| | | * | | | | | | | | qdoc: Completed metadata handling.Martin Smith2011-03-248-126/+152
| | | | |_|/ / / / / / | | | |/| | | | | | |
| | * | | | | | | | | fix configure.exe option -opengl desktopMark Brand2011-03-311-1/+1
| | | |_|_|/ / / / / | | |/| | | | | | |
* | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-masteraxis2011-04-0744-6884/+10895
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into mast...Qt Continuous Integration System2011-04-042-1/+5
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| | * | | | | | | | Designer [Qt Creator integration]: Fix integrated property editor.Friedemann Kleint2011-04-042-1/+5
| * | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-3142-6883/+10890
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | 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
| | |\ \ \ \ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | |
| | | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-2218-76/+159
| | | |\ \ \ \ \ \ \
| | | * | | | | | | | qdoc: Avoid infinite loops in table of contents generation.David Boddie2011-03-211-1/+4