summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Smith2009-04-301-21/+28
|\
| * Documentation work.Michael Brasser2009-04-301-21/+28
* | qdoc: Corrected some qdoc warnings.Martin Smith2009-04-301-1/+2
|/
* qdoc: Corrected some qdoc warnings.Martin Smith2009-04-291-1/+2
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Michael Brasser2009-04-2813-35/+30
|\
| * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-2811-11/+11
| |\
| | * Changed doc.trolltech.com links to doc.qtsoftware.comSimon Hausmann2009-04-2811-11/+11
| * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-276-6/+6
| |\ \ | | |/
| | * Increment Qt version number in qdoc namespaces.Jason McDonald2009-04-276-6/+6
| * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-243-3/+6
| |\ \ | | |/
| | * Updated WebKit from /home/shausman/src/webkit/trunk to origin/qtwebkit-4.5 ( ...Simon Hausmann2009-04-243-3/+6
| | * Change Qt version number to 4.5.2Thiago Macieira2009-04-246-10/+10
| * | Merge branch '4.5'Thiago Macieira2009-04-231-7/+0
| |\ \ | | |/
| | * use qdoc3 debug version only when it is availableJoerg Bornemann2009-04-231-7/+0
| * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-235-10/+9
| |\ \ | | |/
| | * Make all qdoc footers consistent with the main Qt docs.Jason McDonald2009-04-225-10/+9
| * | Remove git merge conflict markersSimon Hausmann2009-04-222-2/+0
* | | qdoc: Corrected a few qdoc warnings.Martin Smith2009-04-282-14/+20
* | | Make the documentation build.Alexis Menard2009-04-232-2/+0
* | | Change the QML element docs filename prefix "qml-" rather than "qml".Martin Jones2009-04-232-5/+5
* | | Merge in changes to old kinetic-dui branch.Michael Brasser2009-04-234-8/+31
* | | Merge branch 'master' of ../../qt/qt into kinetic-declarativeuiMichael Brasser2009-04-226-9/+11
|\ \ \ | |/ /
| * | Merge branch '4.5'Rhys Weatherley2009-04-216-9/+11
| |\ \ | | |/
| | * Doc - Changed the namespace in the qdocconf file to reflect Qt 4.5.1kh2009-04-216-19/+19
* | | Initial import of kinetic-dui branch from the old kineticMichael Brasser2009-04-2222-421/+1602
|/ /
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-171-1/+1
|\ \ | |/
| * Doc - Changed the namespace in the qdocconf file to reflect Qt 4.5.1Kavindra Devi Palaraja2009-04-161-1/+1
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-012-2/+6
|\ \ | |/
| * Doc: Exclude the internal Phonon classes from the Assistant documentation.David Boddie2009-03-302-2/+6
* | Merge branch '4.5' of git@scm.dev.troll.no:qt/qtSimon Hausmann2009-03-261-0/+2
|\ \ | |/
| * Squashed commit of the following:David Boddie2009-03-261-0/+2
* | Merge branch '4.5' of git@scm.dev.troll.no:qt/qtSimon Hausmann2009-03-241-0/+8
|\ \ | |/
| * Squashed commit of the following:David Boddie2009-03-241-0/+8
| * Long live Qt 4.5!Lars Knoll2009-03-23120-0/+34795
* Long live Qt!Lars Knoll2009-03-23120-0/+34795