summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-10324-1/+12534
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-09324-1/+12534
| |\
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-05324-1/+12534
| | |\
| | | * Merge branch 'kinetic-declarativeui' of git://git-nokia.trolltech.com.au/qtso...Warwick Allison2010-02-04324-1/+12534
| | | |\
| | | | * Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic int...Bea Lam2010-02-0311-14/+17
| | | | |\
| | | | | * Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara...Warwick Allison2010-02-0211-14/+17
| | | | | |\
| | | | * | | Disallow ids that start with uppercase letters and update docs andBea Lam2010-02-0312-37/+37
| | | | |/ /
| | | | * | Fix QList<QObject*> as a model. Add docs and example.Martin Jones2010-02-016-0/+252
| | | | * | Update advanced tutorial with new imagesAlan Alpert2010-02-018-0/+0
| | | | * | Don't use statics for type definition, at least for plugin modules.Warwick Allison2010-02-011-1/+6
| | | | * | Replace FreeMono by OCRA fontKai Koehne2010-01-223-1/+1
| | | | * | Remove samegame README (mentioned images have been replaced)Kai Koehne2010-01-221-10/+0
| | | | * | Copy updated images from demos/samegame to samegame tutorialKai Koehne2010-01-225-0/+0
| | | | * | Fix examples/declarative/plugins exampleAlan Alpert2010-01-191-1/+2
| | | | * | Merge branch '4.6' of ../qt into kinetic-declarativeuiAaron Kennedy2010-01-195-172/+174
| | | | |\ \
| | | | * \ \ Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara...Warwick Allison2010-01-141125-1244/+1275
| | | | |\ \ \
| | | | * | | | Allow QML types defined in both C++ and QML files to be in the same module.Warwick Allison2010-01-089-31/+135
| | | | * | | | Load qmlmodules plugins.Warwick Allison2010-01-074-0/+136
| | | | * | | | Remove loader. Its functionality is now available in qmlviewer.Martin Jones2009-12-2212-1086/+0
| | | | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeuiMichael Brasser2009-12-179-76/+113
| | | | |\ \ \ \
| | | | * | | | | Allow a ListView.section.delegate to avoid creating sections in delegate.Martin Jones2009-12-161-15/+10
| | | | * | | | | Faster sections.Martin Jones2009-12-161-1/+2
| | | | * | | | | spring follows do not like to operate on "var" sourcesmae2009-12-141-1/+1
| | | | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeuiMichael Brasser2009-12-101-2/+2
| | | | |\ \ \ \ \
| | | | * | | | | | Update FlowPositioner to the new BasePositioner implementationAlan Alpert2009-12-091-5/+0
| | | | * | | | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Alan Alpert2009-12-091-9/+53
| | | | |\ \ \ \ \ \
| | | | | * | | | | | Add a Flow positioner.Martin Jones2009-12-081-9/+53
| | | | * | | | | | | Update positioners exampleAlan Alpert2009-12-091-18/+2
| | | | |/ / / / / /
| | | | * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeuiMichael Brasser2009-12-071-1/+1
| | | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeuiMichael Brasser2009-12-077-22/+25
| | | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2009-12-023-87/+2
| | | | |\ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic int...Martin Jones2009-12-022-3/+19
| | | | | |\ \ \ \ \ \ \ \
| | | | | * | | | | | | | | Remove qlistmodelinterface.h duplicateMartin Jones2009-12-023-87/+2
| | | | * | | | | | | | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2009-12-022-3/+19
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / | | | | | |/| | | | | | | |
| | | | | * | | | | | | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic int...Aaron Kennedy2009-12-011-60/+0
| | | | | |\ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / /
| | | | | * | | | | | | | | Merge branch 'kinetic-declarativeui' of /Users/akennedy/Qt/kinetic2 into kine...Aaron Kennedy2009-11-304-13/+17
| | | | | |\ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeuiAaron Kennedy2009-11-304-13/+17
| | | | | | |\ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | Two way WorkerScript communicationsAaron Kennedy2009-11-302-3/+19
| | | | | |/ / / / / / / / / /
| | | | * | | | | | | | | | | When loading QML, reset the Browser view.Martin Jones2009-12-021-4/+17
| | | | | |_|/ / / / / / / / | | | | |/| | | | | | | | |
| | | | * | | | | | | | | | Remove accidentally added file.Michael Brasser2009-12-011-60/+0
| | | | * | | | | | | | | | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara...Warwick Allison2009-11-304-13/+17
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / | | | | |/| / / / / / / / / | | | | | |/ / / / / / / /
| | | | * | | | | | | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic int...Aaron Kennedy2009-11-301-7/+1
| | | | |\ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2009-11-303-2/+3
| | | | | |\ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | Add ListView snapMode to ensure flicking settles on an item boundary.Martin Jones2009-11-301-7/+1
| | | | * | | | | | | | | | | Basic WorkerScript functionalityAaron Kennedy2009-11-302-0/+46
| | | | | |/ / / / / / / / / | | | | |/| | | | | | | | |
| | | | * | | | | | | | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-11-293-2/+3
| | | | |\ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | Fix tutorial3.Michael Brasser2009-11-291-1/+1
| | | | | * | | | | | | | | | Fix use of XmlHttpRequest in examplesAlan Alpert2009-11-271-0/+1
| | | | | |/ / / / / / / / /
| | | | | * | | | | | | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic int...Martin Jones2009-11-2791-847/+277
| | | | | |\ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic int...Martin Jones2009-11-273-3/+88
| | | | | |\ \ \ \ \ \ \ \ \ \