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 |
* | | | Doc: Fixed spelling errors that were blocking the CI system. | David Boddie | 2011-06-20 | 1 | -2/+2 |
* | | | 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 | 6 | -10/+26 |
|\ \ \ | |||||
| * \ \ | Merge branch 4.7 into qt-4.8-from-4.7 | Qt Continuous Integration System | 2011-06-07 | 3 | -0/+14 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-06-06 | 3 | -0/+14 |
| | |\ \ | | | |/ | |||||
| | | * | Have -small-screen enabled in certain examples on Symbian always. | Laszlo Agocs | 2011-06-06 | 3 | -0/+14 |
| * | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7 | Olivier Goffart | 2011-05-31 | 1 | -1/+11 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-05-27 | 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 | 16 | -2149/+24 |
| |\ \ \ | |||||
| * | | | | 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 | 174 | -0/+6960 |
* | | | | | Doc: Speculative attempt to fix build breakage. | David Boddie | 2011-06-08 | 1 | -1/+1 |
* | | | | | Doc: Fixed file name of a header file to use lower case characters. | David Boddie | 2011-06-07 | 1 | -1/+1 |
* | | | | | Merge branch '4.8' | David Boddie | 2011-05-27 | 2 | -2/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Doc: Fixed a scope test for maemo5 and made an error a warning instead. | David Boddie | 2011-05-27 | 2 | -2/+2 |
| * | | | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt into 4.8 | David Boddie | 2011-05-24 | 14 | -2149/+0 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
* | | | | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt | David Boddie | 2011-05-24 | 14 | -2149/+0 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | Revert all QScroller and QFlickGesture related code. | Robert Griebl | 2011-05-16 | 14 | -2149/+0 |
| * | | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7 | Olivier Goffart | 2011-05-03 | 1 | -0/+6 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-review into 4.7 | David Boddie | 2011-05-02 | 1 | -0/+6 |
| | |\ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | | * | | | Ensured that incomplete downloads are removed. | David Boddie | 2011-04-07 | 1 | -0/+6 |
* | | | | | | Merge branch '4.8' | David Boddie | 2011-05-13 | 3 | -2/+6 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | Doc: Added missing project and desktop files. | David Boddie | 2011-05-11 | 15 | -0/+235 |
| * | | | | | Doc: Added fixes left over from previous merges. | David Boddie | 2011-05-11 | 1 | -0/+3 |
| * | | | | | Squashed commit of changes from the 4.8-temp branch. | David Boddie | 2011-05-11 | 1318 | -0/+57782 |
| * | | | | | Doc: Fixed incorrect button handling. | David Boddie | 2011-05-09 | 1 | -2/+2 |
| * | | | | | More examples adjusted to Symbian and Maemo5. | Daniel Molkentin | 2011-05-05 | 2 | -0/+16 |
| * | | | | | Added missing resource files. | David Boddie | 2011-05-04 | 2 | -0/+12 |
| * | | | | | Added missing data files. Renamed resource files. | David Boddie | 2011-05-04 | 6 | -0/+159 |
| * | | | | | Fixed line endings. | David Boddie | 2011-05-04 | 7 | -0/+316 |
| * | | | | | Squashed commit of the changes from the mobile-examples repository | David Boddie | 2011-05-04 | 712 | -3500/+4344 |
| |/ / / / | |||||
* | | | | | 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 line endings. | David Boddie | 2011-04-28 | 7 | -0/+316 |
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-team | David Boddie | 2011-04-28 | 9 | -315/+315 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Squashed commit of the changes from the mobile-examples repository | David Boddie | 2011-04-27 | 712 | -3500/+4344 |
* | | | | | | Squashed commit of the changes from the mobile-examples repository | David Boddie | 2011-04-28 | 1878 | -1545/+58418 |
|/ / / / / | |||||
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt | David Boddie | 2011-04-18 | 313 | -439/+10412 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | 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 | 37 | -66/+1240 |
| | |\ \ \ \ |