summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3/test/qt-build-docs.qdocconf
Commit message (Expand)AuthorAgeFilesLines
* Doc: Simplified Commercial Editions for Qt 4.7.David Boddie2010-02-191-8/+0
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-121-5/+11
|\
| * Doc/qdoc: Converted encoding of ISO-8859-1 docs to UTF-8. Output UTF-8.David Boddie2010-02-081-2/+7
| * Doc: Synchronize configuration files for easier maintenance.David Boddie2010-02-021-3/+4
* | Merge branch 'kinetic-declarativeui' of git://git-nokia.trolltech.com.au/qtso...Warwick Allison2010-02-041-2/+3
|\ \ | |/ |/|
| * Merge branch '4.6' of ../qt into kinetic-declarativeuiAaron Kennedy2010-01-201-3/+3
| |\
| | * Bump version to 4.6.2.Jason McDonald2010-01-191-3/+3
| * | Doc fixes.Michael Brasser2010-01-151-1/+1
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeuiMichael Brasser2009-12-071-3/+4
| |\ \ | | |/
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati...Michael Brasser2009-10-251-1/+1
| |\ \
| * \ \ Merge commit 'qt-mainline/4.6' into kinetic-declarativeuiAndreas Aardal Hanssen2009-10-021-2/+0
| |\ \ \
| * \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati...Michael Brasser2009-09-291-0/+2
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Michael Brasser2009-08-131-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Aaron Kennedy2009-07-231-2/+2
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Michael Brasser2009-06-221-1/+0
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Michael Brasser2009-04-281-3/+4
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' of ../../qt/qt into kinetic-declarativeuiMichael Brasser2009-04-221-3/+3
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Initial import of kinetic-dui branch from the old kineticMichael Brasser2009-04-221-1/+2
* | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2Bill King2009-12-161-4/+5
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtGunnar Sletta2009-11-131-0/+1
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6' of c:\dev\qt-graphics-4.6Gunnar Sletta2009-11-041-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | |
* | | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-12-051-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| * | | | | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2009-12-041-3/+3
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Bump version to 4.6.1Jason McDonald2009-12-011-3/+3
| | | |/ / / / / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | doc: Example page now lists images used by the exampleMartin Smith2009-12-041-0/+1
| |/ / / / / / / / / /
* | | | | | | | | | | Merge remote branch 'origin/4.6'Thiago Macieira2009-10-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | / / / / / / / / / | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Doc: Updated the modules for the "Desktop" (Full Framework) edition.David Boddie2009-10-231-1/+1
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch '4.6'Thiago Macieira2009-10-051-2/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Doc: Removed the old Console edition and updated edition naming.David Boddie2009-10-011-2/+0
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch '4.6'Thiago Macieira2009-09-291-0/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Generate mac refs in docs.Jason McDonald2009-09-221-0/+2
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Finish bumping version number to 4.7.0Jason McDonald2009-09-021-2/+2
* | | | | | | Long live Qt 4.7Thiago Macieira2009-09-011-3/+3
* | | | | | | Remove traces of deprecated Assistant and AssistantClient.kh12009-08-311-4/+4
|/ / / / / /
* | | | | | Update URL's to use new domain.Jason McDonald2009-08-121-1/+1
| |_|_|_|/ |/| | | |
* | | | | Doc: Updated the version numbers in the documentation metadata.David Boddie2009-07-171-2/+2
| |_|_|/ |/| | |
* | | | Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-06-191-1/+0
|\ \ \ \ | |_|_|/ |/| | |
| * | | Docs: remove reference to nonexistent fileJoerg Bornemann2009-06-191-1/+0
* | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-281-1/+1
|\ \ \ \ | |/ / /
| * | | Changed doc.trolltech.com links to doc.qtsoftware.comSimon Hausmann2009-04-281-1/+1
* | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-271-1/+1
|\ \ \ \ | |/ / /
| * | | Increment Qt version number in qdoc namespaces.Jason McDonald2009-04-271-1/+1
* | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-241-1/+2
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Updated WebKit from /home/shausman/src/webkit/trunk to origin/qtwebkit-4.5 ( ...Simon Hausmann2009-04-241-1/+2
| * | Change Qt version number to 4.5.2Thiago Macieira2009-04-241-3/+3
* | | Merge branch '4.5'Rhys Weatherley2009-04-211-3/+3
|\ \ \ | |/ / | | / | |/ |/|
| * Doc - Changed the namespace in the qdocconf file to reflect Qt 4.5.1kh2009-04-211-6/+6
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-011-1/+5
|\ \ | |/
| * Doc: Exclude the internal Phonon classes from the Assistant documentation.David Boddie2009-03-301-1/+5
| * Long live Qt 4.5!Lars Knoll2009-03-231-0/+109