Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-01-17 | 94 | -96/+96 |
|\ | |||||
| * | Update copyright year to 2011. | Jason McDonald | 2011-01-10 | 93 | -93/+93 |
| * | Fix for qtdemo bug | Jerome Pasion | 2011-01-10 | 1 | -3/+3 |
* | | Merge remote branch 'qt/master' | Jason McDonald | 2010-11-22 | 1 | -1/+1 |
|\ \ | |||||
| * \ | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-11-19 | 5 | -13/+27 |
| |\ \ | |||||
* | \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60 | axis | 2010-11-19 | 10 | -30/+43 |
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | |||||
| * | | Merge remote branch 'qt/4.7' into 4.7 | Jason McDonald | 2010-11-18 | 5 | -14/+27 |
| |\ \ | | |/ | |||||
| | * | qdoc: Added QML Elements to the Assistant index | Martin Smith | 2010-11-11 | 3 | -10/+20 |
| | * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | Martin Smith | 2010-11-11 | 2 | -3/+3 |
| | |\ | |||||
| | * | | qdoc: Fixed virtualness and constness of the fileBase() function. | Martin Smith | 2010-11-11 | 2 | -4/+7 |
| * | | | Bump Qt version to 4.7.2. | Jason McDonald | 2010-11-12 | 12 | -40/+40 |
| | |/ | |/| | |||||
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-11-12 | 4 | -40/+229 |
|\ \ \ | |/ / | |||||
| * | | Doc: Fixing typo | Sergio Ahumada | 2010-11-09 | 1 | -1/+1 |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-11-08 | 2 | -3/+3 |
| |\ \ | | |/ | |/| | |||||
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-11-05 | 2 | -3/+3 |
| | |\ | |||||
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-11-03 | 2 | -3/+3 |
| | | |\ | |||||
| | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-11-03 | 2 | -3/+3 |
| | | | |\ | |||||
| | | | | * | Doc: Fixing typo | Sergio Ahumada | 2010-11-01 | 2 | -3/+3 |
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | David Boddie | 2010-11-05 | 1 | -2/+2 |
| |\ \ \ \ \ | |||||
| | * | | | | | Doc: adding html clasnames to the next and previous links | Morten Engvoldsen | 2010-11-04 | 1 | -2/+2 |
| | |/ / / / | |||||
| * | | | | | Doc: Updated the configuration file to use the Qt 4.7 style sheets. | David Boddie | 2010-11-05 | 1 | -34/+219 |
| * | | | | | qdoc: Remove leading QML: text from certain node names. | David Boddie | 2010-11-04 | 1 | -1/+5 |
| |/ / / / | |||||
* | | | | | Ensured that the document nodes are sorted in the generated index. | David Boddie | 2010-11-08 | 1 | -2/+69 |
* | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-11-05 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | Morten Engvoldsen | 2010-11-04 | 1 | -2/+2 |
| |\ \ \ \ | | |/ / / | |||||
| * | | | | Doc: Correcting character escape bug | Morten Engvoldsen | 2010-11-04 | 1 | -1/+1 |
* | | | | | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2010-11-04 | 2 | -4/+34 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integration | Qt Continuous Integration System | 2010-11-03 | 2 | -4/+34 |
| |\ \ \ \ | | |/ / / | | | / / | | |/ / | |/| | | |||||
| | * | | qdoc: Added next and previous links to top of pages. | Martin Smith | 2010-11-03 | 1 | -3/+1 |
| | * | | Doc: updating the template to support search feature better. | Morten Engvoldsen | 2010-11-03 | 1 | -1/+33 |
| | |/ | |||||
* | | | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2010-11-03 | 1 | -2/+2 |
|\ \ \ | |/ / | |||||
| * | | fix qdoc doc generation | Oswald Buddenhagen | 2010-11-01 | 1 | -2/+2 |
| |/ | |||||
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-10-25 | 4 | -75/+74 |
|\ \ | |/ | |||||
| * | Doc: fixing unclosed <p> | Morten Engvoldsen | 2010-10-15 | 1 | -1/+1 |
| * | Added Q_INVOKABLE to ignore file. | Jerome Pasion | 2010-10-08 | 1 | -2/+3 |
| * | qdoc: Don't generate html output for png files. | Martin Smith | 2010-10-07 | 1 | -2/+2 |
| * | Doc: Fixed the in-repository licenses for the documentation. | David Boddie | 2010-10-04 | 1 | -5/+5 |
| * | Doc: Removed a superfluous comment. | David Boddie | 2010-10-04 | 1 | -1/+0 |
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | David Boddie | 2010-09-30 | 14 | -89/+68 |
| |\ | |||||
| * | | Doc: Fixed non-well-formed table output. | David Boddie | 2010-09-24 | 1 | -1/+1 |
| * | | Doc: Fixed coding style breakage in qdoc source code. | David Boddie | 2010-09-23 | 1 | -65/+64 |
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-10-07 | 1 | -32/+8 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge branch '4.7' into newSearch | Morten Engvoldsen | 2010-09-28 | 2 | -47/+19 |
| |\ \ | |||||
| | * | | Doc: fixing bugs in slim-fit style | Morten Engvoldsen | 2010-09-28 | 1 | -31/+0 |
| * | | | Doc: Implementing new search display | Morten Engvoldsen | 2010-09-24 | 1 | -1/+8 |
* | | | | Merge remote branch 'origin/4.7' into master-from-4.7 | Rohan McGovern | 2010-10-04 | 2 | -18/+21 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Added a condition to skip obsolete functions during the threadness check. | Jerome Pasion | 2010-09-24 | 1 | -16/+19 |
| |/ / | |||||
| * | | Doc: maintainance - fixing grammar and spelling | Morten Engvoldsen | 2010-09-23 | 1 | -2/+2 |
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Thiago Macieira | 2010-09-22 | 1 | -4/+4 |
|\ \ \ | |/ / | |||||
| * | | Bump version to 4.7.1. | Jason McDonald | 2010-09-21 | 12 | -40/+40 |
| |/ |