Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6 | Rohan McGovern | 2010-03-06 | 1 | -0/+14 |
|\ | |||||
| * | Added .condition modifier to SUBDIRS. | Miikka Heikkinen | 2010-03-01 | 1 | -0/+14 |
* | | Update QML documentation snippets to latest syntax. | Aaron Kennedy | 2010-03-05 | 6 | -29/+5 |
* | | Updating documentation for how to build QWS with tslib | Jørgen Lind | 2010-03-03 | 1 | -1/+4 |
* | | QMetaType: Now we can register typedefs. | Olivier Goffart | 2010-03-02 | 1 | -0/+5 |
* | | Merge branch '4.6' | Miikka Heikkinen | 2010-02-26 | 1 | -0/+13 |
|\ \ | |/ | |||||
| * | Added addMMPRules for adding conditional MMP_RULES | Miikka Heikkinen | 2010-02-26 | 1 | -0/+13 |
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60 | axis | 2010-02-26 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | doc: Added QScopedArrayPointer and corrected QScopedPointer snippet. | Martin Smith | 2010-02-23 | 1 | -1/+1 |
* | | Merge remote branch 'origin/master' into bearermanagement/staging | Aaron McCarthy | 2010-02-23 | 2 | -3/+3 |
|\ \ | |||||
| * \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra... | Qt Continuous Integration System | 2010-02-22 | 2 | -3/+3 |
| |\ \ | |||||
| | * | | Rename MouseRegion -> MouseArea | Martin Jones | 2010-02-22 | 2 | -3/+3 |
* | | | | Merge remote branch 'origin/master' into bearermanagement/unit-tests | Aaron McCarthy | 2010-02-22 | 2 | -2/+2 |
|\ \ \ \ | |/ / / | |||||
| * | | | Doc: these files are NOT part of the test suite of the Qt toolkit | Thiago Macieira | 2010-02-20 | 2 | -2/+2 |
| |/ / | |||||
* | | | Use snippets. | Aaron McCarthy | 2010-02-15 | 1 | -0/+49 |
* | | | Expand documentation for QNAM::setConfiguration() and friends. | Aaron McCarthy | 2010-02-15 | 1 | -0/+9 |
|/ / | |||||
* | | Merge remote branch 'origin/master' into qt-master-from-4.6 | Thiago Macieira | 2010-02-13 | 21 | -0/+468 |
|\ \ | |||||
| * \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra... | Qt Continuous Integration System | 2010-02-10 | 21 | -0/+468 |
| |\ \ | |||||
| | * \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra... | Qt Continuous Integration System | 2010-02-05 | 21 | -0/+468 |
| | |\ \ | |||||
| | | * \ | Merge branch 'kinetic-declarativeui' of git://git-nokia.trolltech.com.au/qtso... | Warwick Allison | 2010-02-04 | 21 | -0/+468 |
| | | |\ \ | |||||
| | | | * \ | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic int... | Bea Lam | 2010-02-03 | 2 | -4/+19 |
| | | | |\ \ | |||||
| | | | | * \ | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara... | Warwick Allison | 2010-02-02 | 2 | -4/+19 |
| | | | | |\ \ | |||||
| | | | * | | | | Disallow ids that start with uppercase letters and update docs and | Bea Lam | 2010-02-03 | 2 | -2/+2 |
| | | | |/ / / | |||||
| | | | * | | | Merge commit 'qt/4.6' into kinetic-declarativeui | Bjørn Erik Nilsen | 2010-01-27 | 1 | -1/+1 |
| | | | |\ \ \ | |||||
| | | | * \ \ \ | Merge branch '4.6' of ../qt into kinetic-declarativeui | Aaron Kennedy | 2010-01-20 | 1 | -1/+1 |
| | | | |\ \ \ \ | |||||
| | | | * \ \ \ \ | Merge branch '4.6' of ../qt into kinetic-declarativeui | Aaron Kennedy | 2010-01-19 | 2 | -2/+20 |
| | | | |\ \ \ \ \ | |||||
| | | | * \ \ \ \ \ | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara... | Warwick Allison | 2010-01-14 | 787 | -805/+821 |
| | | | |\ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui | Michael Brasser | 2009-12-10 | 1 | -6/+6 |
| | | | |\ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui | Michael Brasser | 2009-12-07 | 1 | -1/+0 |
| | | | |\ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara... | Warwick Allison | 2009-11-27 | 3 | -1/+53 |
| | | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara... | Warwick Allison | 2009-11-19 | 1 | -5/+1 |
| | | | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | | doc | Warwick Allison | 2009-11-13 | 1 | -0/+31 |
| | | | * | | | | | | | | | | | Merge remote branch 'qt/4.6' into kinetic-declarativeui | Andreas Aardal Hanssen | 2009-11-11 | 1 | -6/+6 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara... | Warwick Allison | 2009-11-09 | 4 | -19/+53 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | | | | Rename targets -> matchTargets and properties -> matchProperties. | Michael Brasser | 2009-11-06 | 1 | -1/+1 |
| | | | * | | | | | | | | | | | | | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara... | Warwick Allison | 2009-11-04 | 2 | -3/+2 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | | | | | Doc | Aaron Kennedy | 2009-10-27 | 1 | -0/+15 |
| | | | * | | | | | | | | | | | | | | Doc. | Michael Brasser | 2009-10-26 | 1 | -6/+10 |
| | | | * | | | | | | | | | | | | | | Docs. | Martin Jones | 2009-10-21 | 1 | -0/+12 |
| | | | * | | | | | | | | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati... | Michael Brasser | 2009-10-19 | 13 | -1694/+157 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati... | Michael Brasser | 2009-10-06 | 1 | -2/+2 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | | | | | | | lowercase ids | Yann Bodson | 2009-10-06 | 7 | -34/+34 |
| | | | * | | | | | | | | | | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati... | Michael Brasser | 2009-09-29 | 6 | -79/+15 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | | | | | | | | Repeater doc update. | Yann Bodson | 2009-09-21 | 1 | -7/+9 |
| | | | * | | | | | | | | | | | | | | | | | Merge commit 'origin/4.6' into kinetic-declarativeui | Lars Knoll | 2009-09-18 | 1 | -0/+40 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit 'qt-mainline/4.6' into kinetic-declarativeui | Andreas Aardal Hanssen | 2009-09-15 | 1 | -0/+109 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit 'qt-mainline/4.6' into kinetic-declarativeui | Andreas Aardal Hanssen | 2009-09-15 | 791 | -3163/+3285 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | | | | | | | | | | | More ListView API changes. | Martin Jones | 2009-09-14 | 1 | -5/+5 |
| | | | * | | | | | | | | | | | | | | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati... | Michael Brasser | 2009-09-08 | 2 | -3/+44 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati... | Martin Jones | 2009-09-08 | 5 | -5/+118 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |