Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | Fix PBuffer example to work again | Gunnar Sletta | 2011-03-10 | 3 | -18/+36 |
* | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into qt-master-from-4.7 | Thiago Macieira | 2011-03-11 | 17 | -17/+17 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Update copyright year to 2011. | Rohan McGovern | 2011-03-10 | 17 | -17/+17 |
| |/ / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | 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 | 4 | -4/+5 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | | 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 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | / / / / / / / | | |_|_|/ / / / / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | PinchArea example produced incorrect scaling. | Martin Jones | 2011-03-07 | 1 | -2/+9 |
| | |/ / / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2011-02-28 | 3 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Do not link with libm on INTEGRITY | Rolland Dudemaine | 2011-02-22 | 3 | -3/+3 |
* | | | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-02-23 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| / / / / / / / / | |/ / / / / / / / | |||||
| * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-02-18 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Fix FocusScope example. | Michael Brasser | 2011-02-18 | 1 | -1/+1 |
| | |/ / / / / / / | |||||
* | | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-02-10 | 3 | -3/+4 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ... | Qt Continuous Integration System | 2011-02-04 | 3 | -3/+4 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | / / / / / | | | |/ / / / / | | |/| | | | | | |||||
| | * | | | | | | Merge branch '4.7-upstream' into 4.7-doc | A-Team | 2011-01-28 | 1 | -0/+1 |
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | / | | | |_|_|_|/ | | |/| | | | | |||||
| | * | | | | | Doc: Fixed errors in the address book tutorial. | David Boddie | 2011-01-25 | 2 | -2/+2 |
| | * | | | | | Doc: Fixed invalid/incomplete QML code snippets. | David Boddie | 2011-01-17 | 1 | -1/+2 |
| | | |_|_|/ | | |/| | | | |||||
* | | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration... | Qt Continuous Integration System | 2011-02-10 | 11 | -6/+262 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-02-04 | 11 | -6/+262 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Update Docs, Examples and Demos for new CreateObject overloadable | Christopher Ham | 2011-01-28 | 1 | -5/+2 |