summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-054-6/+88
|\
| * Merge branch 'kinetic-declarativeui' of git://git-nokia.trolltech.com.au/qtso...Warwick Allison2010-02-044-6/+88
| |\
| | * Merge branch '4.6' of ../qt into kinetic-declarativeuiAaron Kennedy2010-01-206-10/+10
| | |\
| | | * Bump version to 4.6.2.Jason McDonald2010-01-196-10/+10
| | * | Merge branch '4.6' of ../qt into kinetic-declarativeuiAaron Kennedy2010-01-191-1/+1
| | |\ \ | | | |/
| | * | Doc fixes.Michael Brasser2010-01-152-3/+3
| | * | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara...Warwick Allison2010-01-1493-93/+93
| | |\ \
| | * \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeuiAaron Kennedy2010-01-051-3/+3
| | |\ \ \
| | * \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeuiMichael Brasser2009-12-173-4/+47
| | |\ \ \ \
| | * \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeuiMichael Brasser2009-12-072-5/+2
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeuiMichael Brasser2009-12-0714-36/+178
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara...Warwick Allison2009-11-271-16/+0
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara...Warwick Allison2009-11-192-7/+7
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara...Warwick Allison2009-11-121-30/+0
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | qdoc3: Allow the full signature for QML signals and methodsMartin Smith2009-11-114-25/+41
| | | * | | | | | | | | qdoc3: Output the full signature for QML signals and methodsMartin Smith2009-11-112-2/+5
| | | * | | | | | | | | qdoc3: Fixed a linking problem for qml methods.Martin Smith2009-11-117-88/+152
| | * | | | | | | | | | Don't display "QML" for attached signals/methods.Michael Brasser2009-11-111-2/+2
| | * | | | | | | | | | qdoc3: Allow the full signature for QML signals and methodsMartin Smith2009-11-104-25/+41
| | * | | | | | | | | | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara...Warwick Allison2009-11-092-2/+32
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | * | | | | | | | | | qdoc3: Output the full signature for QML signals and methodsMartin Smith2009-11-062-2/+5
| | * | | | | | | | | | qdoc3: Fixed a linking problem for qml methods.Martin Smith2009-11-057-88/+152
| | * | | | | | | | | | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara...Warwick Allison2009-11-041-1/+0
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Accidental commit.Warwick Allison2009-11-022-1271/+0
| | * | | | | | | | | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Aaron Kennedy2009-10-305-22/+47
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | qdoc3: display 'read-only' in QML docs for read only properties.Michael Brasser2009-10-304-6/+33
| | | * | | | | | | | | | | qdoc3: Fixed a linking error for qml properties.Martin Smith2009-10-292-16/+14
| | * | | | | | | | | | | | Rename QFx classes to QmlGraphicsAaron Kennedy2009-10-301-2/+2
| | |/ / / / / / / / / / /
| | * | | | | | | | | | | Merge branch '4.6' of ../qt into kinetic-declarativeuiAaron Kennedy2009-10-291-150/+0
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati...Michael Brasser2009-10-255-15/+73
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Prepend element name for detailed attached property docs.Michael Brasser2009-10-212-2/+6
| | * | | | | | | | | | | | | doc now in globalobject.qdoc, not READMEWarwick Allison2009-10-202-0/+1271
| | * | | | | | | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati...Michael Brasser2009-10-195-17/+56
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati...Michael Brasser2009-10-199-279/+458
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Improve qdoc generated QML documentation.Michael Brasser2009-10-097-10/+33
| | * | | | | | | | | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati...Michael Brasser2009-10-041-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit 'qt-mainline/4.6' into kinetic-declarativeuiAndreas Aardal Hanssen2009-10-0217-101/+209
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati...Michael Brasser2009-09-2911-18/+98
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit 'origin/4.6' into kinetic-declarativeuiLars Knoll2009-09-183-4/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit 'qt-mainline/4.6' into kinetic-declarativeuiAndreas Aardal Hanssen2009-09-1589-356/+356
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit 'qt/4.6' into kinetic-declarativeuiBjørn Erik Nilsen2009-09-011-1/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati...Michael Brasser2009-08-3189-1157/+1157
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati...Michael Brasser2009-08-254-8/+14
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | Various doc fixes.Michael Brasser2009-08-191-29/+10
| | * | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Michael Brasser2009-08-195-30/+51
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Martin Jones2009-08-171-3/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Michael Brasser2009-08-13102-157/+207
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of ../qt into kinetic-declarativeuiAaron Kennedy2009-07-304-5/+18
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of ../qt into kinetic-declarativeuiAaron Kennedy2009-07-292-4/+25
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Aaron Kennedy2009-07-2313-45/+95
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \