summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-03-143-18/+36
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-teamaavit2011-03-103-18/+36
| |\
| | * Fix PBuffer example to work againGunnar Sletta2011-03-103-18/+36
* | | Merge remote-tracking branch 'origin/master' into qt-master-from-4.7Thiago Macieira2011-03-1117-17/+17
|\ \ \
| * | | Update copyright year to 2011.Rohan McGovern2011-03-1017-17/+17
| |/ /
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2011-03-111-1/+21
|\ \ \ | |/ / |/| |
| * | PinchArea example produced incorrect scaling.Martin Jones2011-03-081-2/+9
| * | Merge branch '4.7' into qtquick11Martin Jones2011-03-014-4/+5
| |\ \
| * | | Add LayoutMirroring attached property for mirroring QML layoutsJoona Petrell2011-03-011-1/+21
* | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-03-071-2/+9
|\ \ \ \ | |_|_|/ |/| | |
| * | | PinchArea example produced incorrect scaling.Martin Jones2011-03-071-2/+9
| | |/ | |/|
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-02-283-3/+3
|\ \ \
| * | | Do not link with libm on INTEGRITYRolland Dudemaine2011-02-223-3/+3
* | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-231-1/+1
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-181-1/+1
| |\ \
| | * | Fix FocusScope example.Michael Brasser2011-02-181-1/+1
| | |/
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-103-3/+4
|\ \ \ | |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ...Qt Continuous Integration System2011-02-043-3/+4
| |\ \ | | |/ | |/|
| | * Merge branch '4.7-upstream' into 4.7-docA-Team2011-01-281-0/+1
| | |\
| | * | Doc: Fixed errors in the address book tutorial.David Boddie2011-01-252-2/+2
| | * | Doc: Fixed invalid/incomplete QML code snippets.David Boddie2011-01-171-1/+2
* | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-02-1011-6/+262
|\ \ \ \
| * \ \ \ Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-0411-6/+262
| |\ \ \ \ | | |/ / /
| | * | | Update Docs, Examples and Demos for new CreateObject overloadableChristopher Ham2011-01-281-5/+2
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Bea Lam2011-01-271-0/+1
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Add a layout direction example to positionersJoona Petrell2011-01-197-0/+169
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-191441-1452/+1454
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Fix examples autotest failureJoona Petrell2011-01-111-1/+1
| | * | | PinchArea API changes following review.Martin Jones2011-01-071-3/+3
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-072-4/+4
| | |\ \ \
| | * | | | Use deselect() function in text selection exampleJoona Petrell2010-12-311-1/+1
| | * | | | Add copyright headerMartin Jones2010-12-201-0/+40
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Joona Petrell2010-12-201-1/+1
| | |\ \ \ \
| | * | | | | Revert "Add mirroring-positioners.qml example" that was accidentally pushedJoona Petrell2010-12-131-70/+0
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2010-12-133-2/+79
| | |\ \ \ \ \
| | | * | | | | Add mirroring-positioners.qml exampleJoona Petrell2010-12-131-0/+70
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2010-12-011-2/+3
| | |\ \ \ \ \ \
| | * | | | | | | Add an example of using PinchArea.Martin Jones2010-11-292-0/+50
* | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-02-091-3/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix building of examples with -no-webkitJohn Brooks2011-02-091-3/+3
* | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master...Qt Continuous Integration System2011-02-042-0/+19
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Add Context2D QtScript benchmarkKent Hansen2011-02-042-0/+19
| |/ / / / / / / /
* | | | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-011-0/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | / | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Fix: define hotSpot for Gestures on MacZeno Albisser2011-01-261-0/+1
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Fixed a stupid typoRobert Griebl2011-01-261-1/+1
* | | | | | | Various small fixes for the QScroller examplesRobert Griebl2011-01-2411-31/+28
* | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-171441-1448/+1450
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Update copyright year to 2011.Jason McDonald2011-01-101440-1448/+1448
| * | | | | | Examples: Fix compilation with namespace.Christian Kandeler2011-01-072-4/+4
| * | | | | | fix include pathMark Brand2011-01-061-0/+2
| | |_|_|_|/ | |/| | | |
generated by cgit v0.12 at 2024-11-25 00:55:45 (GMT)