summaryrefslogtreecommitdiffstats
path: root/examples/declarative
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into qt-master-from-4.7Thiago Macieira2011-03-112-2/+2
|\
| * Update copyright year to 2011.Rohan McGovern2011-03-102-2/+2
* | 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-012-2/+3
| |\
| * | 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 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-101-1/+2
|\ \ \ | |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ...Qt Continuous Integration System2011-02-041-1/+2
| |\ \ | | |/ | |/|
| | * Doc: Fixed invalid/incomplete QML code snippets.David Boddie2011-01-171-1/+2
* | | 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
| * | 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-19237-237/+237
| |\ \ | | |/
| * | Fix examples autotest failureJoona Petrell2011-01-111-1/+1
| * | PinchArea API changes following review.Martin Jones2011-01-071-3/+3
| * | Use deselect() function in text selection exampleJoona Petrell2010-12-311-1/+1
| * | Add copyright headerMartin Jones2010-12-201-0/+40
| * | 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
| * | | Add an example of using PinchArea.Martin Jones2010-11-292-0/+50
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-17237-237/+237
|\ \ \ \ | | |_|/ | |/| |
| * | | Update copyright year to 2011.Jason McDonald2011-01-10237-237/+237
| | |/ | |/|
* | | Merge branch 'earth/file-engine-refactor' of scm.dev.nokia.troll.no:qt/qt-fil...Qt Continuous Integration System2010-12-142-2/+2
|\ \ \
| * \ \ Merge remote branch 'qt/master' into file-engine-refactorJoão Abecasis2010-11-239-71/+143
| |\ \ \
| * | | | Fix deployment for examples and testsShane Kearns2010-10-122-2/+2
* | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-062-2/+9
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| |
| * | | Add 'Writing New Components' docs, and document the connect() function.Bea Lam2010-12-032-2/+9
| | |/ | |/|
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-122-10/+12
|\ \ \ | |/ /
| * | docWarwick Allison2010-11-091-1/+1
| * | highlightranges.qml example and visual test contained binding loop.Martin Jones2010-11-031-9/+11
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-253-58/+20
|\ \ \ | |/ /
| * | Remove accidentially committed .qmlproject.user file, ignore this filetypeDaniel Molkentin2010-10-221-41/+0
| * | Tic-tac-toe: Fix z-order of status text.Daniel Molkentin2010-10-191-16/+18
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-141-1/+2
| |\ \
| | * | Doc: Fixing bug - line too long and not visible. Breaking the line in twoMorten Engvoldsen2010-10-071-1/+2
| | |/
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-152-1/+109
|\ \ \ | |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-10-141-0/+108
| |\ \
| | * | Add new behavior example.Yann Bodson2010-10-131-0/+108
| | |/
| * | Fix samegame tutorial jsAlan Alpert2010-10-141-1/+1
| |/
* | Align .pro with qmake: s/\.sources/.files/.Miikka Heikkinen2010-10-082-2/+2
|/
* Replace all occurances of "Qt 4.7" with "QtQuick 1.0"Aaron Kennedy2010-09-29126-131/+131
* Fix example.Michael Brasser2010-09-241-1/+1
* Fix corkboards example for smaller screensJoona Petrell2010-09-211-4/+11
* Fix easing example having wrong contentHeightJoona Petrell2010-09-211-1/+1