summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* 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
| * 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
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-201-1/+1
|\ \
| * | Make QMLViewer startup animation stop after a whileAlan Alpert2011-04-191-1/+1
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-151-1/+1
|\ \ \ | |/ /
| * | Adding plugin qmltooling/qmlostplugin for QML debugging over OST (USB) on Sym...Tom Sutcliffe2011-04-141-1/+1
| * | QmlDebug: Rename 'tcpserver' library to 'qmldbg_tcp'Kai Koehne2011-04-141-1/+1
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-04-121-5/+7
|\ \ \
| * | | fix detection of relative location informationOswald Buddenhagen2011-04-111-5/+7
* | | | 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 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
| | |_|/ / / | |/| | | |