Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Re-apply licenseheader text in source files for qt4.8 | Jyri Tahtela | 2011-06-27 | 66 | -1133/+1133 |
* | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7 | Liang Qi | 2011-06-24 | 35 | -0/+1448 |
|\ | |||||
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7 | Laszlo Agocs | 2011-06-20 | 1 | -1/+11 |
| |\ | |||||
| * | | Qmlshadersplugin examples added. | Marko Niemelä | 2011-06-13 | 35 | -0/+1448 |
* | | | Added missing license headers. | David Boddie | 2011-06-17 | 3 | -0/+120 |
* | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt | David Boddie | 2011-06-17 | 3 | -3/+13 |
|\ \ \ | |||||
| * \ \ | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7 | Olivier Goffart | 2011-05-31 | 1 | -1/+11 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Remove unnecessary QtQuick 1.1 effectiveLayoutDirection, effectiveHorizontalA... | Joona Petrell | 2011-05-27 | 1 | -1/+11 |
| | |/ | |||||
| * | | Merge remote-tracking branch 'qt/4.8' into master-qml-team | Kai Koehne | 2011-05-24 | 1 | -0/+18 |
| |\ \ | |||||
| * | | | Fix QtDeclarative keyinteraction example | Yann Bodson | 2011-05-23 | 2 | -2/+2 |
* | | | | Added missing license headers. | David Boddie | 2011-06-15 | 3 | -0/+120 |
* | | | | Doc: Added missing license headers for documentation and examples. | David Boddie | 2011-06-08 | 144 | -0/+5760 |
* | | | | Merge branch '4.8' | David Boddie | 2011-05-13 | 2 | -0/+4 |
|\ \ \ \ | |||||
| * | | | | Doc: Added missing project and desktop files. | David Boddie | 2011-05-11 | 14 | -0/+224 |
| * | | | | Squashed commit of changes from the 4.8-temp branch. | David Boddie | 2011-05-11 | 963 | -0/+50211 |
| * | | | | Squashed commit of the changes from the mobile-examples repository | David Boddie | 2011-05-04 | 139 | -2031/+4 |
| | |/ / | |/| | | |||||
* | | | | Squashed merge of the master-temp branch. | David Boddie | 2011-05-06 | 16 | -0/+279 |
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-team | David Boddie | 2011-05-06 | 1 | -0/+18 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt | David Boddie | 2011-05-03 | 1 | -0/+18 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-04-18 | 1 | -0/+18 |
| | |\ \ \ | | | |/ / | | |/| / | | | |/ | |||||
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-04-14 | 1 | -0/+18 |
| | | |\ | |||||
| | | | * | Add pincharea.qmlproject file for PinchArea example. | Martin Jones | 2011-04-14 | 1 | -0/+18 |
| | | * | | Fixed license headers for examples in 4.7 | Timo Turunen | 2011-04-05 | 6 | -162/+156 |
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-team | David Boddie | 2011-04-28 | 2 | -0/+0 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Squashed commit of the changes from the mobile-examples repository | David Boddie | 2011-04-27 | 139 | -2031/+4 |
| |/ / / | |||||
* | | | | Squashed commit of the changes from the mobile-examples repository | David Boddie | 2011-04-28 | 969 | -76/+48201 |
|/ / / | |||||
* | | | Merge remote branch 'qa-review/master' into qa-staging-master | Rohan McGovern | 2011-04-07 | 3 | -3/+3 |
|\ \ \ | |||||
| * \ \ | Merge qt/qt.git master into qa-team-master | Rohan McGovern | 2011-03-24 | 12 | -8/+1142 |
| |\ \ \ | |||||
| * | | | | Update copyright year to 2011. | Jason McDonald | 2011-01-10 | 237 | -237/+237 |
* | | | | | 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 |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | |