Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra... | Qt Continuous Integration System | 2010-02-05 | 4 | -6/+88 |
|\ | |||||
| * | Merge branch 'kinetic-declarativeui' of git://git-nokia.trolltech.com.au/qtso... | Warwick Allison | 2010-02-04 | 4 | -6/+88 |
| |\ | |||||
| | * | Merge branch '4.6' of ../qt into kinetic-declarativeui | Aaron Kennedy | 2010-01-20 | 6 | -10/+10 |
| | |\ | |||||
| | | * | Bump version to 4.6.2. | Jason McDonald | 2010-01-19 | 6 | -10/+10 |
| | * | | Merge branch '4.6' of ../qt into kinetic-declarativeui | Aaron Kennedy | 2010-01-19 | 1 | -1/+1 |
| | |\ \ | | | |/ | |||||
| | * | | Doc fixes. | Michael Brasser | 2010-01-15 | 2 | -3/+3 |
| | * | | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara... | Warwick Allison | 2010-01-14 | 93 | -93/+93 |
| | |\ \ | |||||
| | * \ \ | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui | Aaron Kennedy | 2010-01-05 | 1 | -3/+3 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui | Michael Brasser | 2009-12-17 | 3 | -4/+47 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui | Michael Brasser | 2009-12-07 | 2 | -5/+2 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui | Michael Brasser | 2009-12-07 | 14 | -36/+178 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara... | Warwick Allison | 2009-11-27 | 1 | -16/+0 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara... | Warwick Allison | 2009-11-19 | 2 | -7/+7 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara... | Warwick Allison | 2009-11-12 | 1 | -30/+0 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | 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 |
| | * | | | | | | | | | | Don't display "QML" for attached signals/methods. | Michael Brasser | 2009-11-11 | 1 | -2/+2 |
| | * | | | | | | | | | | qdoc3: Allow the full signature for QML signals and methods | Martin Smith | 2009-11-10 | 4 | -25/+41 |
| | * | | | | | | | | | | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara... | Warwick Allison | 2009-11-09 | 2 | -2/+32 |
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | |||||
| | * | | | | | | | | | | qdoc3: Output the full signature for QML signals and methods | Martin Smith | 2009-11-06 | 2 | -2/+5 |
| | * | | | | | | | | | | qdoc3: Fixed a linking problem for qml methods. | Martin Smith | 2009-11-05 | 7 | -88/+152 |
| | * | | | | | | | | | | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara... | Warwick Allison | 2009-11-04 | 1 | -1/+0 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | Accidental commit. | Warwick Allison | 2009-11-02 | 2 | -1271/+0 |
| | * | | | | | | | | | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic... | Aaron Kennedy | 2009-10-30 | 5 | -22/+47 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | qdoc3: display 'read-only' in QML docs for read only properties. | Michael Brasser | 2009-10-30 | 4 | -6/+33 |
| | | * | | | | | | | | | | | qdoc3: Fixed a linking error for qml properties. | Martin Smith | 2009-10-29 | 2 | -16/+14 |
| | * | | | | | | | | | | | | Rename QFx classes to QmlGraphics | Aaron Kennedy | 2009-10-30 | 1 | -2/+2 |
| | |/ / / / / / / / / / / | |||||
| | * | | | | | | | | | | | Merge branch '4.6' of ../qt into kinetic-declarativeui | Aaron Kennedy | 2009-10-29 | 1 | -150/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati... | Michael Brasser | 2009-10-25 | 5 | -15/+73 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | Prepend element name for detailed attached property docs. | Michael Brasser | 2009-10-21 | 2 | -2/+6 |
| | * | | | | | | | | | | | | | doc now in globalobject.qdoc, not README | Warwick Allison | 2009-10-20 | 2 | -0/+1271 |
| | * | | | | | | | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati... | Michael Brasser | 2009-10-19 | 5 | -17/+56 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati... | Michael Brasser | 2009-10-19 | 9 | -279/+458 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | Improve qdoc generated QML documentation. | Michael Brasser | 2009-10-09 | 7 | -10/+33 |
| | * | | | | | | | | | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati... | Michael Brasser | 2009-10-04 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit 'qt-mainline/4.6' into kinetic-declarativeui | Andreas Aardal Hanssen | 2009-10-02 | 17 | -101/+209 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati... | Michael Brasser | 2009-09-29 | 11 | -18/+98 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit 'origin/4.6' into kinetic-declarativeui | Lars Knoll | 2009-09-18 | 3 | -4/+6 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit 'qt-mainline/4.6' into kinetic-declarativeui | Andreas Aardal Hanssen | 2009-09-15 | 89 | -356/+356 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit 'qt/4.6' into kinetic-declarativeui | Bjørn Erik Nilsen | 2009-09-01 | 1 | -1/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati... | Michael Brasser | 2009-08-31 | 89 | -1157/+1157 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati... | Michael Brasser | 2009-08-25 | 4 | -8/+14 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | | | | | | Various doc fixes. | Michael Brasser | 2009-08-19 | 1 | -29/+10 |
| | * | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar... | Michael Brasser | 2009-08-19 | 5 | -30/+51 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar... | Martin Jones | 2009-08-17 | 1 | -3/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar... | Michael Brasser | 2009-08-13 | 102 | -157/+207 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of ../qt into kinetic-declarativeui | Aaron Kennedy | 2009-07-30 | 4 | -5/+18 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of ../qt into kinetic-declarativeui | Aaron Kennedy | 2009-07-29 | 2 | -4/+25 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar... | Aaron Kennedy | 2009-07-23 | 13 | -45/+95 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |