Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | | | | | 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 | |
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11 | Bea Lam | 2011-01-27 | 1 | -0/+1 | |
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | ||||||
| | * | | | | | | Add a layout direction example to positioners | Joona Petrell | 2011-01-19 | 7 | -0/+169 | |
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11 | Martin Jones | 2011-01-19 | 1441 | -1452/+1454 | |
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | ||||||
| | * | | | | | | Fix examples autotest failure | Joona Petrell | 2011-01-11 | 1 | -1/+1 | |
| | * | | | | | | PinchArea API changes following review. | Martin Jones | 2011-01-07 | 1 | -3/+3 | |
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11 | Martin Jones | 2011-01-07 | 2 | -4/+4 | |
| | |\ \ \ \ \ \ | ||||||
| | * | | | | | | | Use deselect() function in text selection example | Joona Petrell | 2010-12-31 | 1 | -1/+1 | |
| | * | | | | | | | Add copyright header | Martin Jones | 2010-12-20 | 1 | -0/+40 | |
| | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11 | Joona Petrell | 2010-12-20 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | | | ||||||
| | * | | | | | | | Revert "Add mirroring-positioners.qml example" that was accidentally pushed | Joona Petrell | 2010-12-13 | 1 | -70/+0 | |
| | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11 | Martin Jones | 2010-12-13 | 3 | -2/+79 | |
| | |\ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | Add mirroring-positioners.qml example | Joona Petrell | 2010-12-13 | 1 | -0/+70 | |
| | * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11 | Martin Jones | 2010-12-01 | 1 | -2/+3 | |
| | |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | Add an example of using PinchArea. | Martin Jones | 2010-11-29 | 2 | -0/+50 | |
* | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2011-02-09 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Fix building of examples with -no-webkit | John Brooks | 2011-02-09 | 1 | -3/+3 | |
* | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master... | Qt Continuous Integration System | 2011-02-04 | 2 | -0/+19 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Add Context2D QtScript benchmark | Kent Hansen | 2011-02-04 | 2 | -0/+19 | |
| |/ / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-02-01 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | / / / | | |_|_|_|_|_|/ / / | |/| | | | | | | | | ||||||
| * | | | | | | | | | Fix: define hotSpot for Gestures on Mac | Zeno Albisser | 2011-01-26 | 1 | -0/+1 | |
| | |_|_|_|_|/ / / | |/| | | | | | | | ||||||
* | | | | | | | | | Fixed a stupid typo | Robert Griebl | 2011-01-26 | 1 | -1/+1 | |
* | | | | | | | | | Various small fixes for the QScroller examples | Robert Griebl | 2011-01-24 | 11 | -31/+28 | |
* | | | | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-01-17 | 1441 | -1448/+1450 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | / | |_|_|_|_|_|_|/ |/| | | | | | | | ||||||
| * | | | | | | | Update copyright year to 2011. | Jason McDonald | 2011-01-10 | 1440 | -1448/+1448 | |
| * | | | | | | | Examples: Fix compilation with namespace. | Christian Kandeler | 2011-01-07 | 2 | -4/+4 | |
| * | | | | | | | fix include path | Mark Brand | 2011-01-06 | 1 | -0/+2 | |
| | |_|_|_|/ / | |/| | | | | | ||||||
* | | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-12-23 | 2 | -4/+4 | |
|\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integration | Qt Continuous Integration System | 2010-12-21 | 2 | -4/+4 | |
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | / | | | |_|_|/ | | |/| | | | ||||||
| | * | | | | Merge branch '4.7-upstream' into 4.7-doc | A-Team | 2010-12-03 | 2 | -2/+9 | |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | ||||||
| | * | | | | Doc:Fix paths in styleplugin/echoplugin .pro files | Geir Vattekar | 2010-11-26 | 2 | -4/+4 | |
| | | |_|/ | | |/| | | ||||||
* | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-12-20 | 1 | -1/+1 | |
|\ \ \ \ \ | |/ / / / |