Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2011-04-06 | 6 | -162/+156 |
|\ | |||||
| * | Fixed license headers for examples in master | Timo Turunen | 2011-04-05 | 6 | -162/+156 |
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-03-31 | 1 | -1/+1 |
|\ \ | |/ |/| | |||||
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7 | David Boddie | 2011-03-22 | 12 | -151/+1021 |
| |\ | |||||
| * \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7 | David Boddie | 2011-03-09 | 1 | -2/+9 |
| |\ \ | |||||
| * \ \ | Merge commit 'refs/merge-requests/1108' of git://gitorious.org/qt/qt into mer... | David Boddie | 2011-02-23 | 1 | -1/+1 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'jpasions-qt-doc-team-qtquick-4.7' into 4.7 | David Boddie | 2011-02-17 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge branch '4.7' into jpasions-qt-doc-team-qtquick-4.7 | David Boddie | 2011-01-25 | 1 | -1/+2 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | Jerome Pasion | 2011-01-17 | 237 | -237/+237 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | Re-organized the Qt Quick page. Changed titles and links. | Jerome Pasion | 2010-12-20 | 1 | -1/+1 |
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7 | David Boddie | 2011-02-04 | 11 | -6/+262 |
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-03-22 | 12 | -171/+1021 |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | |||||
| * | | | | | | | fixes/improvements for new QML right-to-left docs | Bea Lam | 2011-03-21 | 3 | -9/+9 |
| * | | | | | | | Write Qt Quick 1.1 right-to-left documentation and examples | Joona Petrell | 2011-03-18 | 12 | -171/+1021 |
* | | | | | | | | Merge remote-tracking branch 'origin/master' into qt-master-from-4.7 | Thiago Macieira | 2011-03-11 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Update copyright year to 2011. | Rohan McGovern | 2011-03-10 | 2 | -2/+2 |
* | | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Thiago Macieira | 2011-03-11 | 1 | -1/+21 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| / / / / / / / | |/ / / / / / / | |||||
| * | | | | | | | PinchArea example produced incorrect scaling. | Martin Jones | 2011-03-08 | 1 | -2/+9 |
| * | | | | | | | Merge branch '4.7' into qtquick11 | Martin Jones | 2011-03-01 | 2 | -2/+3 |
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | |||||
| * | | | | | | | Add LayoutMirroring attached property for mirroring QML layouts | Joona Petrell | 2011-03-01 | 1 | -1/+21 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2011-03-07 | 1 | -2/+9 |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | PinchArea example produced incorrect scaling. | Martin Jones | 2011-03-07 | 1 | -2/+9 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-02-23 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-02-18 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| | * | | | | | Fix FocusScope example. | Michael Brasser | 2011-02-18 | 1 | -1/+1 |
| | |/ / / / | |||||
* | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-02-10 | 1 | -1/+2 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ... | Qt Continuous Integration System | 2011-02-04 | 1 | -1/+2 |
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / / | |||||
| | * | | | Doc: Fixed invalid/incomplete QML code snippets. | David Boddie | 2011-01-17 | 1 | -1/+2 |
| | | |/ | | |/| | |||||
* | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-02-04 | 11 | -6/+262 |
|\ \ \ \ | |/ / / | |||||
| * | | | Update Docs, Examples and Demos for new CreateObject overloadable | Christopher Ham | 2011-01-28 | 1 | -5/+2 |
| * | | | Add a layout direction example to positioners | Joona Petrell | 2011-01-19 | 7 | -0/+169 |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11 | Martin Jones | 2011-01-19 | 237 | -237/+237 |
| |\ \ \ | | |/ / | |||||
| * | | | Fix examples autotest failure | Joona Petrell | 2011-01-11 | 1 | -1/+1 |
| * | | | PinchArea API changes following review. | Martin Jones | 2011-01-07 | 1 | -3/+3 |
| * | | | Use deselect() function in text selection example | Joona Petrell | 2010-12-31 | 1 | -1/+1 |
| * | | | Add copyright header | Martin Jones | 2010-12-20 | 1 | -0/+40 |
| * | | | Revert "Add mirroring-positioners.qml example" that was accidentally pushed | Joona Petrell | 2010-12-13 | 1 | -70/+0 |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11 | Martin Jones | 2010-12-13 | 3 | -2/+79 |
| |\ \ \ | |||||
| | * | | | Add mirroring-positioners.qml example | Joona Petrell | 2010-12-13 | 1 | -0/+70 |
| | | |/ | | |/| | |||||
| * | | | Add an example of using PinchArea. | Martin Jones | 2010-11-29 | 2 | -0/+50 |
* | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-01-17 | 237 | -237/+237 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Update copyright year to 2011. | Jason McDonald | 2011-01-10 | 237 | -237/+237 |
| | |/ | |/| | |||||
* | | | Merge branch 'earth/file-engine-refactor' of scm.dev.nokia.troll.no:qt/qt-fil... | Qt Continuous Integration System | 2010-12-14 | 2 | -2/+2 |
|\ \ \ | |||||
| * \ \ | Merge remote branch 'qt/master' into file-engine-refactor | João Abecasis | 2010-11-23 | 9 | -71/+143 |
| |\ \ \ | |||||
| * | | | | Fix deployment for examples and tests | Shane Kearns | 2010-10-12 | 2 | -2/+2 |
* | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-12-06 | 2 | -2/+9 |
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| | | |||||
| * | | | Add 'Writing New Components' docs, and document the connect() function. | Bea Lam | 2010-12-03 | 2 | -2/+9 |
| | |/ | |/| | |||||
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-11-12 | 2 | -10/+12 |
|\ \ \ | |/ / | |||||
| * | | doc | Warwick Allison | 2010-11-09 | 1 | -1/+1 |
| * | | highlightranges.qml example and visual test contained binding loop. | Martin Jones | 2010-11-03 | 1 | -9/+11 |