Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 4.8 into qt-4.8-from-4.7 | Sergio Ahumada | 2011-09-01 | 1 | -1/+6 |
|\ | |||||
| * | Merge remote branch 'qt-doc-review/master' | Casper van Donderen | 2011-08-31 | 2 | -2/+2 |
| |\ | |||||
| | * | Merge branch '4.8' | Casper van Donderen | 2011-08-30 | 2 | -7/+8 |
| | |\ | |||||
| * | \ | Merge remote branch 'qt-doc-team/4.8' | Casper van Donderen | 2011-08-29 | 1 | -1/+6 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Doc: Small addition to the QML anchor layout docs | Geir Vattekar | 2011-08-24 | 1 | -1/+6 |
| | * | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt into 4.8 | David Boddie | 2011-06-09 | 2 | -24/+7 |
| | |\ \ | |||||
| | * \ \ | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt into 4.8 | David Boddie | 2011-05-24 | 48 | -481/+481 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt into 4.8 | David Boddie | 2011-05-16 | 1 | -0/+123 |
| | |\ \ \ \ | |||||
* | | \ \ \ \ | Merge remote-tracking branch 'upstream/4.8' into qt-4.8-from-4.7 | Sergio Ahumada | 2011-08-31 | 1 | -4/+3 |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in... | Qt Continuous Integration System | 2011-08-27 | 2 | -2/+2 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | Improve documentation for QDeclarativeView::setSource() | Keith Isdale | 2011-08-18 | 1 | -4/+3 |
* | | | | | | | Merge branch 4.7 into qt-4.8-from-4.7 | Sergio Ahumada | 2011-08-31 | 2 | -2/+2 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | Doc: Added a simple introduction to Qt and fixed links. | David Boddie | 2011-08-30 | 2 | -2/+2 |
* | | | | | | | Merge branch 4.7 into qt-4.8-from-4.7 | Sergio Ahumada | 2011-08-26 | 2 | -2/+2 |
|\ \ \ \ \ \ \ | |/ / / / / / | | / / / / / | |/ / / / / |/| | | | | | |||||
* | | | | | | Merge branch 'master' of ../qt-qml-staging | Michael Brasser | 2011-08-11 | 10 | -63/+165 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt | Aaron Kennedy | 2011-08-04 | 10 | -63/+161 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Doc: Added a simple introduction to Qt and fixed links. | David Boddie | 2011-07-01 | 2 | -2/+2 |
| | * | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7 | Liang Qi | 2011-06-24 | 3 | -11/+25 |
| | |\ \ \ \ \ \ | | | |/ / / / / | |||||
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7 | Laszlo Agocs | 2011-06-20 | 2 | -24/+7 |
| | | |\ \ \ \ \ | |||||
| | | * | | | | | | Qmlshadersplugin examples added. | Marko Niemelä | 2011-06-13 | 1 | -11/+12 |
| | | * | | | | | | Qmlshadersplugin API documentation enhancements. | Marko Niemelä | 2011-06-13 | 2 | -0/+13 |
| | * | | | | | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt | David Boddie | 2011-06-17 | 2 | -18/+5 |
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | | | |||||
| | | * | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7 | Olivier Goffart | 2011-05-31 | 2 | -24/+7 |
| | | |\ \ \ \ \ \ | | | | | |/ / / / | | | | |/| | | / | | | | |_|_|_|/ | | | |/| | | | | |||||
| | | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-05-27 | 2 | -24/+7 |
| | | | |\ \ \ \ | | | | | |/ / / | | | | |/| | | | |||||
| | | | | * | | | Remove unnecessary QtQuick 1.1 effectiveLayoutDirection, effectiveHorizontalA... | Joona Petrell | 2011-05-27 | 2 | -24/+7 |
| | * | | | | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt | David Boddie | 2011-05-24 | 48 | -481/+604 |
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | / / | | | |_|_|/ / | | |/| | | | | |||||
| | * | | | | | Doc: Various fixes to documentation, some based on changes in master. | David Boddie | 2011-05-11 | 3 | -31/+35 |
| | * | | | | | Squashed commit of the changes from the mobile-examples repository | David Boddie | 2011-05-04 | 4 | -1/+94 |
| * | | | | | | Doc | Aaron Kennedy | 2011-07-29 | 1 | -1/+1 |
| * | | | | | | Doc | Aaron Kennedy | 2011-07-29 | 1 | -1/+5 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Document state fast-forwarding. | Michael Brasser | 2011-07-07 | 1 | -0/+22 |
* | | | | | | qmlplugindump: Update qmltypes file format documentation. | Christian Kamm | 2011-07-05 | 1 | -2/+4 |
|/ / / / / | |||||
* | | | | | Merge remote branch 'origin/4.7' into 4.8-from-4.7 | Rohan McGovern | 2011-05-17 | 48 | -481/+481 |
|\ \ \ \ \ | | |/ / / | |/| | / | |_|_|/ |/| | | | |||||
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2011-05-17 | 48 | -480/+480 |
| |\ \ \ | |||||
| | * | | | Update licenseheader text in source files | Jyri Tahtela | 2011-05-13 | 48 | -480/+480 |
| | | |/ | | |/| | |||||
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | David Boddie | 2011-05-13 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | doc: Fixed a QML snippet reference | Martin Smith | 2011-05-09 | 1 | -1/+1 |
* | | | | Allow 'typeinfo <file>' lines in qmldir. | Christian Kamm | 2011-05-12 | 1 | -0/+123 |
| |_|/ |/| | | |||||
* | | | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2011-04-12 | 1 | -0/+19 |
|\ \ \ | |/ / | |||||
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-04-12 | 1 | -0/+19 |
| |\ \ | |||||
| | * | | Allow enum values to be used as signal parameters | Bea Lam | 2011-04-12 | 1 | -0/+19 |
* | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-04-07 | 1 | -0/+206 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-04-04 | 1 | -0/+206 |
| |\ \ \ | | |/ / | | | / | | |/ | |/| | |||||
| | * | Document using Behaviors with States. | Michael Brasser | 2011-04-04 | 1 | -0/+206 |
* | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-03-31 | 37 | -2212/+1935 |
|\ \ \ | |/ / | |||||
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7 | David Boddie | 2011-03-22 | 9 | -42/+294 |
| |\ \ | |||||
| * \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | David Boddie | 2011-03-08 | 2 | -2/+12 |
| |\ \ \ | |||||
| | * | | | Added Qt Quick License information. | Jerome Pasion | 2011-03-03 | 2 | -2/+12 |
| * | | | | Doc: Fixed QML snippet highlighting by creating a complete code snippet. | David Boddie | 2011-03-03 | 1 | -4/+1 |
| |/ / / | |||||
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | David Boddie | 2011-03-01 | 3 | -6/+8 |
| |\ \ \ |