Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt | David Boddie | 2011-03-10 | 13 | -27/+47 |
|\ | |||||
| * | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-02-10 | 12 | -22/+27 |
| |\ | |||||
| | * | Doc: Fixed warnings and other problems found while fixing markup. | David Boddie | 2011-02-07 | 5 | -15/+15 |
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7 | David Boddie | 2011-02-04 | 2 | -5/+20 |
| | |\ | |||||
| | * \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | David Boddie | 2011-01-26 | 5 | -2/+8 |
| | |\ \ | |||||
| | | * \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | Geir Vattekar | 2011-01-25 | 1 | -1/+1 |
| | | |\ \ | |||||
| | | | * | | Doc: fixing bugs and typos based on feedback | Morten Engvoldsen | 2011-01-25 | 1 | -1/+1 |
| | | * | | | Doc: Fixed missing images in qt demo | Geir Vattekar | 2011-01-25 | 4 | -1/+7 |
| | | |/ / | |||||
| | * | | | Doc: Fixed qdoc warnings about broken links. | David Boddie | 2011-01-26 | 1 | -2/+2 |
| | |/ / | |||||
| | * | | Merge branch '4.7' of ../qt into 4.7 | David Boddie | 2011-01-13 | 257 | -257/+257 |
| | |\ \ | |||||
| | * \ \ | Merge branch '4.7' into qdoc-simplified | David Boddie | 2010-12-15 | 1 | -1/+1 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch 'qdoc-simplified' into mimir-simplified | David Boddie | 2010-12-14 | 1 | -1/+2 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'qdoc-simplified' into mimir-simplified | David Boddie | 2010-12-07 | 1 | -2/+3 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | doc: Corrections to linking errors detected by the DITA XML generator.. | Martin Smith | 2010-11-01 | 1 | -3/+2 |
| * | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-02-04 | 2 | -5/+20 |
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | |||||
| | * | | | | | | Add initial size to ListView in FolderListModel example | Bea Lam | 2011-02-02 | 1 | -1/+6 |
| | * | | | | | | Add a layout direction example to positioners | Joona Petrell | 2011-01-19 | 1 | -4/+14 |
| | | |_|_|_|/ | | |/| | | | | |||||
* | | | | | | | Doc: Mentioned the QQ Parenthesis article in two examples | Geir Vattekar | 2011-01-21 | 2 | -1/+13 |
|/ / / / / / | |||||
* | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-01-17 | 257 | -257/+257 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Update copyright year to 2011. | Jason McDonald | 2011-01-10 | 257 | -257/+257 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-12-23 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | Geir Vattekar | 2010-12-09 | 1 | -1/+2 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| * | | | | Doc: Fixed doc bug in Diagram Scene example | Geir Vattekar | 2010-12-09 | 1 | -1/+1 |
| | |_|/ | |/| | | |||||
* | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-12-06 | 1 | -1/+2 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Add 'Writing New Components' docs, and document the connect() function. | Bea Lam | 2010-12-03 | 1 | -1/+2 |
| |/ / | |||||
* | | | Fix license header. | Jason McDonald | 2010-12-06 | 1 | -5/+5 |
* | | | QScroller merge, part 1 | Robert Griebl | 2010-12-02 | 1 | -0/+109 |
* | | | Fix license headers | Jason McDonald | 2010-12-01 | 2 | -10/+10 |
* | | | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2010-10-25 | 1 | -2/+3 |
|\ \ \ | |/ / | |||||
| * | | Doc: Fixed qdoc warnings. | David Boddie | 2010-10-08 | 1 | -2/+3 |
| |/ | |||||
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-10-25 | 257 | -1286/+1483 |
|\ \ | |/ | |||||
| * | Resized image, added missing files, and reformatted documentation of | Jerome Pasion | 2010-10-08 | 1 | -10/+14 |
| * | Doc: correct spelling | Morten Engvoldsen | 2010-10-07 | 1 | -1/+1 |
| * | Added the QtWebKit bridge Image Analyzer example. | Jerome Pasion | 2010-10-04 | 1 | -0/+155 |
| * | Doc: Fixed the in-repository licenses for the documentation. | David Boddie | 2010-10-04 | 256 | -1280/+1280 |
| * | Doc: Made a number of fixes to the documentation. | David Boddie | 2010-10-04 | 2 | -5/+43 |
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-09-10 | 2 | -4/+4 |
|\ \ | |/ | |||||
| * | Doc: More work on the QML documentation. | David Boddie | 2010-09-07 | 1 | -1/+1 |
| * | Merge branch '4.7' into qmldocs | David Boddie | 2010-09-01 | 1 | -2/+2 |
| |\ | |||||
| | * | Updated Twitter demo in response to the new Twitter oauth requirement | Jens Bache-Wiig | 2010-08-31 | 1 | -2/+2 |
| * | | Merge branch '4.7' into qmldocs | David Boddie | 2010-08-27 | 2 | -0/+15 |
| |\ \ | | |/ | |||||
| * | | Doc: More work on the QML documentation. | David Boddie | 2010-08-27 | 1 | -1/+1 |
* | | | Add multicastsender and multicastreceiver examples | Bradley T. Hughes | 2010-09-01 | 2 | -0/+72 |
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-08-25 | 5 | -6/+21 |
|\ \ \ | | |/ | |/| | |||||
| * | | Document calling QObject methods from QML in Extending QML in C++ docs. | Martin Jones | 2010-08-25 | 2 | -0/+15 |
| |/ | |||||
| * | Fix minehunt demo for Symbian | Joona Petrell | 2010-08-20 | 1 | -1/+1 |
| * | diagramscene example: fix leak and crashes. | Olivier Goffart | 2010-08-16 | 1 | -1/+2 |
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7 | David Boddie | 2010-08-13 | 2 | -9/+10 |
| |\ | |||||
* | \ | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-08-13 | 4 | -61/+69 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge commit 'remotes/origin/4.7' into qt47s2 | Thomas Zander | 2010-08-11 | 2 | -9/+11 |
| |\ \ | | |/ | |/| |