summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Expand)AuthorAgeFilesLines
* Update examples/declarative.proYann Bodson2010-03-292-2/+7
* Remove colorbrowser exampleYann Bodson2010-03-295-311/+0
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-2912-0/+381
|\
| * Add focus and key navigation example.Yann Bodson2010-03-298-0/+209
| * Add example on how to use Qt widgets in qml.Yann Bodson2010-03-294-0/+172
* | Update for import dir and imageProvider changes.Warwick Allison2010-03-292-3/+14
|/
* sourceWidth/sourceHeight -> sourceSizeWarwick Allison2010-03-261-12/+11
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-261-0/+1
|\
| * Add declarative subdir to examples.proJoona Petrell2010-03-261-0/+1
* | Control of image rendered size (esp. SVG).Warwick Allison2010-03-262-0/+70
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Martin Jones2010-03-257-10/+36
|\
| * Use the new memory cost reporting API in QtScript Custom Class exampleKent Hansen2010-03-252-2/+17
| * Merge remote branch 'main/4.7' into 4.7Morten Johan Sørvig2010-03-2522-336/+85
| |\
| * | Compile with QT_NO_NETWORKINTERFACE defined.Aaron McCarthy2010-03-254-6/+17
| * | Bearer management changes from Qt Mobility (6fb31d1e).Aaron McCarthy2010-03-242-2/+2
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.7Alexis Menard2010-03-251-0/+1
|\ \ \ | |_|/ |/| |
| * | Added Symbian UserEnvironment capability to audioinput exampleGareth Stockwell2010-03-231-0/+1
* | | Qt.Infinite -> Animation.InfiniteMichael Brasser2010-03-2512-21/+21
* | | Replace Animation's repeat property with loops.Michael Brasser2010-03-2512-21/+21
* | | Remove support for QML-in-HTML-in-WebViewWarwick Allison2010-03-243-119/+0
* | | Show loading progressWarwick Allison2010-03-233-2/+21
* | | Deprecate inline Script {} blocksAaron Kennedy2010-03-225-194/+43
| |/ |/|
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Martin Jones2010-03-194-4/+3
|\ \
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-03-174-4/+3
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7-s60axis2010-03-1613-6/+49
| | |\ \
| | * | | Fix build break caused by undefined symbol SetDialogPreferenceMiikka Heikkinen2010-03-113-3/+3
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-11125-592/+952
| | |\ \ \
| | * \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-01107-358/+3573
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-02-2387-494/+839
| | |\ \ \ \ \
| | * | | | | | Removed duplicate resource.axis2010-02-231-1/+0
| | * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into merge-w...axis2010-02-1956-85/+85
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into merge-w...axis2010-02-183-98/+98
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-02-16375-1215/+12910
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | use the proper QMake option to find a shared header fileThomas Zander2010-02-123-3/+3
* | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-1828-59/+205
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fix examples after 47fb07c9fdf47584ae55f3412102bbeef5576b04.Yann Bodson2010-03-187-0/+0
| * | | | | | | | | | Fix documentationmae2010-03-162-4/+4
| * | | | | | | | | | add alan's tic-tac-toe AImae2010-03-163-7/+151
| * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-03-1633-84/+133
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-1515-47/+49
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | |
| | | * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Yann Bodson2010-03-111-2/+2
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | Add a positioning 'mode' to positionViewAtIndex()Martin Jones2010-03-111-2/+2
| | | * | | | | | | | | | Move particles in their own plugin (Qt.labs.particles)Yann Bodson2010-03-113-0/+3
| | | |/ / / / / / / / /
| | | * | | | | | | | | Document - and use - the qmlRegisterXXX template functionsmae2010-03-1010-44/+43
| | | * | | | | | | | | Merge remote branch 'qt/4.7' into qml-4.7Qt Continuous Integration System2010-03-101-0/+1
| | | |\ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|/ / | | | | |/| | | | | | |
| | | * | | | | | | | | Oooops --- revert wrong commitmae2010-03-101-1/+1
| * | | | | | | | | | | Remove WorkerListModel and integrate its functionality into ListModel.Bea Lam2010-03-162-1/+1
* | | | | | | | | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-171-0/+11
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | / | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | Added exit softkey to Wiggly exampleMiikka Heikkinen2010-03-151-0/+11
* | | | | | | | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-1513-6/+49
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | / / / / / / / | |_|_|/ / / / / / / |/| | | | | | | | |