Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/4.8' | Sergio Ahumada | 2011-08-29 | 2 | -4/+2 |
|\ | |||||
| * | Merge remote-tracking branch 'qt/4.8' | Sami Lempinen | 2011-08-23 | 8 | -15/+15 |
| |\ | |||||
| * | | Fix bad merge on a couple of xml examples | Miikka Heikkinen | 2011-08-05 | 2 | -4/+2 |
* | | | Merge remote-tracking branch 'mainline/4.8' | Oswald Buddenhagen | 2011-08-26 | 7 | -13/+13 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master... | Qt Continuous Integration System | 2011-08-19 | 1 | -7/+7 |
| |\ \ | |||||
| | * | | Doc: Fixes to Qt tutorial | Geir Vattekar | 2011-07-29 | 1 | -7/+7 |
| | |/ | |||||
| * | | Merge remote-tracking branch 'review/master' | Sergio Ahumada | 2011-08-18 | 6 | -6/+6 |
| |\ \ | |||||
| | * | | Fix files that don't end with a newline character | Sergio Ahumada | 2011-08-12 | 6 | -6/+6 |
| | |/ | |||||
* | | | Merge remote-tracking branch 'mainline/4.8' | Oswald Buddenhagen | 2011-08-18 | 1 | -2/+2 |
|\ \ \ | |/ / | |||||
| * | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7 | Liang Qi | 2011-08-15 | 1 | -2/+2 |
| |\ \ | | |/ | |/| | |||||
| | * | Fix fancybrowser.pro | Shane Kearns | 2011-08-04 | 1 | -1/+1 |
| | * | Re-apply licenseheader text in source files for qt4.7 | Jyri Tahtela | 2011-07-01 | 14 | -241/+241 |
* | | | examples: fix compilation with namespaced Qt. | hjk | 2011-08-15 | 8 | -6/+12 |
|/ / | |||||
* | | Removed demo files accidentally introduced by commit 3abaecc3. | David Boddie | 2011-07-19 | 176 | -9889/+0 |
* | | Removed files with 3rd party copyright notices. | Jerome Pasion | 2011-07-11 | 8 | -3549/+81 |
* | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt | Jerome Pasion | 2011-07-08 | 1 | -0/+1 |
|\ \ | |||||
| * \ | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-air-team | Qt Continuous Integration System | 2011-06-29 | 1 | -0/+1 |
| |\ \ | |||||
| | * \ | Merge branch '4.8' of git://gitorious.org/qt/qt into 4.8 | Alexis Menard | 2011-06-22 | 1920 | -1548/+68125 |
| | |\ \ | |||||
| | * | | | Fix build of Fancy Browser demo. | Alexis Menard | 2011-06-02 | 1 | -0/+1 |
* | | | | | Applied fix (dea9ca8b7a4166e1c3d3fc374621ad02c1220d3a)from qt5/qtbase. | David Boddie | 2011-07-04 | 3 | -1/+6 |
|/ / / / | |||||
* | | | | 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 |