| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge remote branch 'origin/master' | Olivier Goffart | 2010-01-08 | 4 | -7/+50 |
|\ |
|
| * | Merge branch '4.6' | Thiago Macieira | 2009-12-26 | 4 | -7/+50 |
| |\ |
|
| | * | doc: Added a missing \sa command, plus a \l in the text. | Martin Smith | 2009-12-18 | 1 | -3/+3 |
|
|
| | * | doc: Final fix. Example image links now display the image. | Martin Smith | 2009-12-15 | 3 | -1/+47 |
|
|
| | * | doc: Fixed erroneous qdoc error message. | Martin Smith | 2009-12-14 | 1 | -4/+1 |
|
|
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 | Bill King | 2009-12-16 | 1 | -4/+5 |
|\ \ \
| |/ /
|/| | |
|
| * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt | Gunnar Sletta | 2009-11-13 | 2 | -149/+1 |
| |\ \ |
|
| * \ \ | Merge branch '4.6' of ..\qt-graphics-4.6 | Gunnar Sletta | 2009-11-13 | 9 | -119/+202 |
| |\ \ \ |
|
| * \ \ \ | Merge branch '4.6' of c:\dev\qt-graphics-4.6 | Gunnar Sletta | 2009-11-04 | 12 | -56/+163 |
| |\ \ \ \ |
|
* | \ \ \ \ | Merge branch '4.6' | Thiago Macieira | 2009-12-08 | 2 | -5/+2 |
|\ \ \ \ \ \
| | |_|_|_|/
| |/| | | | |
|
| * | | | | | Merge remote branch 'staging/4.6' into 4.6 | Oswald Buddenhagen | 2009-12-07 | 2 | -5/+2 |
| |\ \ \ \ \ |
|
| | * | | | | | make qdoc3 a proper tools subtarget and install it | Oswald Buddenhagen | 2009-12-04 | 1 | -0/+2 |
|
|
| | * | | | | | remove dead file | Oswald Buddenhagen | 2009-12-04 | 1 | -5/+0 |
|
|
* | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt | Simon Hausmann | 2009-12-05 | 10 | -26/+168 |
|\ \ \ \ \ \ \
| |/ / / / / / |
|
| * | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6 | Martin Smith | 2009-12-04 | 6 | -10/+10 |
| |\ \ \ \ \ \
| | |/ / / / / |
|
| | * | | | | | Bump version to 4.6.1 | Jason McDonald | 2009-12-01 | 6 | -10/+10 |
|
|
| * | | | | | | doc: Example page now lists images used by the example | Martin Smith | 2009-12-04 | 10 | -26/+168 |
| |/ / / / / |
|
* | | | | | | Merge branch '4.6' | Thiago Macieira | 2009-11-25 | 2 | -21/+5 |
|\ \ \ \ \ \
| |/ / / / / |
|
| * | | | | | doc: Removed google search engine. | Martin Smith | 2009-11-19 | 1 | -16/+0 |
|
|
| * | | | | | Fixed the closing of the A attribute at the start of each class page | Thorbjørn Lindeijer | 2009-11-17 | 1 | -1/+1 |
|
|
| * | | | | | Merge remote branch 'mainline/4.6' into 4.6 | Oswald Buddenhagen | 2009-11-13 | 8 | -117/+200 |
| |\ \ \ \ \
| | | |_|/ /
| | |/| | | |
|
| * | | | | | Fixed border around classes table at the bottom-right | Thorbjørn Lindeijer | 2009-11-10 | 1 | -4/+4 |
|
|
* | | | | | | Merge branch '4.6' | Thiago Macieira | 2009-11-13 | 8 | -117/+200 |
|\ \ \ \ \ \
| | |/ / / /
| |/| | | /
| |_|_|_|/
|/| | | | |
|
| * | | | | qdoc3: Allow the full signature for QML signals and methods | Martin Smith | 2009-11-11 | 4 | -25/+41 |
|
|
| * | | | | qdoc3: Output the full signature for QML signals and methods | Martin Smith | 2009-11-11 | 2 | -2/+5 |
|
|
| * | | | | qdoc3: Fixed a linking problem for qml methods. | Martin Smith | 2009-11-11 | 7 | -88/+152 |
|
|
| * | | | | Doc: Attempt to fix broken Xcode markup. | David Boddie | 2009-11-11 | 1 | -2/+2 |
| |/ / / |
|
* | | | | Merge branch '4.6' | Thiago Macieira | 2009-11-10 | 12 | -42/+91 |
|\ \ \ \
| |/ / / |
|
| * | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6 | David Boddie | 2009-11-04 | 10 | -23/+75 |
| |\ \ \
| | | |/
| | |/| |
|
| | * | | qdoc updates for QML | Warwick Allison | 2009-11-04 | 10 | -23/+75 |
|
|
| * | | | qdoc: Fixed XHTML breakage caused by the Google search bar markup. | David Boddie | 2009-11-03 | 1 | -2/+2 |
| |/ / |
|
| * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.6 | David Boddie | 2009-11-03 | 2 | -16/+14 |
| |\ \ |
|
| | * | | qdoc3: Fixed a linking error for qml properties. | Martin Smith | 2009-10-29 | 2 | -16/+14 |
|
|
| * | | | qdoc: Disabled reporting the NOTIFY signal until I know what it broke. | Martin Smith | 2009-11-03 | 1 | -1/+0 |
| |/ / |
|
* | | | Merge branch '4.6' | Thiago Macieira | 2009-10-29 | 1 | -149/+0 |
|\ \ \
| |/ / |
|
| * | | Doc: Remove unused file. | David Boddie | 2009-10-27 | 1 | -149/+0 |
|
|
* | | | Merge remote branch 'origin/4.6' | Thiago Macieira | 2009-10-26 | 5 | -15/+73 |
|\ \ \
| |/ /
| | /
| |/
|/| |
|
| * | Doc: Updated the modules for the "Desktop" (Full Framework) edition. | David Boddie | 2009-10-23 | 1 | -1/+1 |
|
|
| * | qdoc3: Added the \qmlattachedsignal and \qmlattachedmethod. | Martin Smith | 2009-10-23 | 4 | -14/+72 |
|
|
* | | Merge branch '4.6' | Thiago Macieira | 2009-10-21 | 5 | -17/+56 |
|\ \
| |/ |
|
| * | qdoc3: Added the \qmlattachedproperty command. | Martin Smith | 2009-10-19 | 5 | -17/+56 |
|
|
* | | Merge branch '4.6' | Thiago Macieira | 2009-10-16 | 5 | -99/+102 |
|\ \
| |/ |
|
| * | Remove qdocconf files for the old mac-specific source package. | Jason McDonald | 2009-10-15 | 3 | -35/+0 |
|
|
| * | qdoc: Made the \sincelist command produce better html. | Martin Smith | 2009-10-14 | 2 | -64/+102 |
|
|
* | | qdoc: Fix misinterpretation of // in strings as a single-line-comment. | Warwick Allison | 2009-10-16 | 1 | -1/+3 |
|
|
* | | Merge branch '4.6' | Thiago Macieira | 2009-10-08 | 6 | -218/+394 |
|\ \
| |/ |
|
| * | Fixed compile. | Rohan McGovern | 2009-10-08 | 1 | -1/+2 |
|
|
| * | qdoc: Removed some debug code and #if 0 code. | Martin Smith | 2009-10-08 | 1 | -113/+1 |
|
|
| * | doc: Changed the format of the since list. | Martin Smith | 2009-10-08 | 6 | -144/+431 |
|
|
* | | Merge branch '4.6' | Thiago Macieira | 2009-10-05 | 7 | -61/+61 |
|\ \
| |/ |
|