Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
* | | | 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 |
| |\ \ \ | |||||
| * | | | | Update copyright year to 2011. | Jason McDonald | 2011-01-10 | 1455 | -1463/+1463 |
* | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-04-07 | 277 | -3/+9488 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ... | Qt Continuous Integration System | 2011-04-06 | 1 | -2/+0 |
| |\ \ \ \ | |||||
| | * | | | | Removed invalid public slots section. | David Boddie | 2011-04-05 | 1 | -2/+0 |
| * | | | | | Fixed license headers for examples in 4.7 | Timo Turunen | 2011-04-05 | 7 | -189/+182 |
| |/ / / / | |||||
| * | | | | Doc: Work on GettingStartedQt tutorial | Geir Vattekar | 2011-03-29 | 6 | -0/+468 |
| * | | | | Merge branch 'clone_4.7' into 4.7 | Jerome Pasion | 2011-03-23 | 270 | -1/+9020 |
| |\ \ \ \ | |||||
| | * | | | | Added QtWebKit Guide JavaScript files. | Jerome Pasion | 2011-03-22 | 14 | -0/+897 |
| | * | | | | Adding QtWebKit Guide example images and created links to images. | Jerome Pasion | 2011-03-22 | 178 | -27/+26 |
| | * | | | | Fixed style issue and replaced image. | Jerome Pasion | 2011-03-22 | 1 | -1/+1 |
| | * | | | | Adding QtWebKit Guide CSS files. | Jerome Pasion | 2011-03-22 | 41 | -0/+4271 |
| | * | | | | Edited QtWebKit Guide. | Jerome Pasion | 2011-03-21 | 1 | -0/+258 |
| | * | | | | Removed compile instruction for the webkit-guide code. | Jerome Pasion | 2011-03-18 | 1 | -1/+0 |
| | * | | | | Edited QtWebKit Guide CSS chapter. Created example links. | Jerome Pasion | 2011-03-17 | 1 | -1/+2 |
| | * | | | | Fixed style issues with QtWebKit guide and examples. | Jerome Pasion | 2011-03-15 | 1 | -7/+7 |
| | * | | | | Adding QtWebKit Guide (BETA). | Jerome Pasion | 2011-03-15 | 39 | -0/+3594 |
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7 | David Boddie | 2011-03-22 | 14 | -153/+1033 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2011-04-06 | 16 | -432/+416 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fixed license headers for examples in master | Timo Turunen | 2011-04-05 | 16 | -432/+416 |
* | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-03-31 | 24 | -2/+974 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7 | David Boddie | 2011-03-22 | 13 | -151/+1024 |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7 | David Boddie | 2011-03-09 | 1 | -2/+9 |
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | Doc: Fixed memory leak in undo framework example | Geir Vattekar | 2011-03-02 | 2 | -0/+7 |
| * | | | | | | Doc: Added a threading tutorial. | David Boddie | 2011-02-24 | 20 | -1/+964 |
| * | | | | | | 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 | 3 | -3/+4 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | Jerome Pasion | 2011-01-17 | 1441 | -1452/+1454 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Re-organized the Qt Quick page. Changed titles and links. | Jerome Pasion | 2010-12-20 | 1 | -1/+1 |
| | * | | | | | | | | | Merge branch '4.7-upstream' into 4.7-doc | A-Team | 2010-12-15 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Doc: Fixed example project file for Symbian. | David Boddie | 2011-02-15 | 1 | -0/+2 |
| * | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7 | David Boddie | 2011-02-04 | 11 | -6/+262 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2011-03-24 | 1 | -0/+17 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Examples: Make the download example also print the SSL errors | Thiago Macieira | 2011-03-22 | 1 | -0/+17 |
* | | | | | | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-03-22 | 12 | -171/+1021 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | / / / | | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-03-21 | 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 branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-03-15 | 1 | -0/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | Merge branch 'backporting-symbian-armcc-to-4.7' into s60-4.7 | axis | 2011-03-14 | 1 | -0/+3 |
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | |||||
| | | * | | | | | | | | | Disable capabilities example for symbian-gcce due to a bug in elf2e32 | axis | 2011-03-04 | 1 | -0/+3 |
* | | | | | | | | | | | | Merge earth-team into master | Olivier Goffart | 2011-03-15 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Disable capabilities example for symbian-gcce due to a bug in elf2e32 | axis | 2011-03-03 | 1 | -0/+3 |
* | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste... | Qt Continuous Integration System | 2011-03-14 | 3 | -18/+36 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-team | aavit | 2011-03-10 | 3 | -18/+36 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ |