summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-09-309-57/+79
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-261-1/+1
| |\
| | * Fix example.Michael Brasser2010-09-241-1/+1
| * | fix RSS listing examplePeter Hartmann2010-09-243-47/+59
| |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-222-5/+12
| |\
| | * Fix corkboards example for smaller screensJoona Petrell2010-09-211-4/+11
| | * Fix easing example having wrong contentHeightJoona Petrell2010-09-211-1/+1
| * | Fix audio glitches in the audiooutput example.Andrew den Exter2010-09-221-2/+2
| |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-201-1/+3
| |\
| | * Support multisampled pbuffers under Windows.Trond Kjernåsen2010-09-201-1/+3
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-171-1/+2
| |\ \ | | |/ | |/|
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-171-1/+2
| | |\
| | | * Fix example after changes to font.letterSpacing.Yann Bodson2010-09-171-1/+2
* | | | Doc: Fixed a memory leak in the undo example.David Boddie2010-09-221-1/+1
|/ / /
* | | Merge commit 'staging-1/4.7' into fridayMorten Engvoldsen2010-09-172-7/+9
|\| |
| * | Make dialcontrol.qml usable on highres capacitive screenAlessandro Portale2010-09-161-0/+1
| * | Make easing.qml usable on highres capacitive screenAlessandro Portale2010-09-161-7/+8
| |/
* | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-17155-147/+231
|\|
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-16150-147/+231
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-09-152-2/+2
| | |\
| | * | Doc: Some editing and tidying up.David Boddie2010-09-131-0/+4
| | * | Doc: Fixed text in license headers.David Boddie2010-09-13149-147/+227
| * | | Add missing images for dynamiclist example.Yann Bodson2010-09-155-0/+0
| | |/ | |/|
* | | Doc: Fixed a non-compiling example.David Boddie2010-09-161-0/+1
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-09-161-1/+1
|\| |
| * | Remove debug, quiet warnings.Aaron McCarthy2010-09-131-1/+1
* | | Merge branch '4.7' of ../qt-doc-team into 4.7David Boddie2010-09-141-1/+1
|\| |
| * | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-09-071-1/+1
| |\ \ | | |/ | |/|
| | * Some small Solaris fixes.Pierre Rossi2010-08-311-1/+1
* | | Merge branch 'fixesfor4.7' into 4.7David Boddie2010-09-134-3/+9
|\ \ \
| * | | minor formatting fixRoland Wolf2010-09-082-2/+2
| * | | fix for compilation with namespaceRoland Wolf2010-09-082-2/+2
| * | | minor formatting fixRoland Wolf2010-09-082-2/+2
| * | | fix for compilation with namespaceRoland Wolf2010-09-084-6/+22
| |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-09-034-12/+6
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-09-034-12/+6
| | |\ \
| | | * | Doc: Fixed namespaced Qt build breakage in the model/view tutorial.David Boddie2010-09-034-12/+6
* | | | | compilation with namespaces was broken. fixedRoland Wolf2010-09-062-3/+1
|/ / / /
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-031-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Fixed compilation of the modelview tutorial on Windows.Kim Motoyoshi Kalland2010-09-031-1/+1
| |/ /
* / / Fix the same bug that was in the demo samegame, in the tutorial versionAlan Alpert2010-09-031-2/+2
|/ /
* | QString usage cleanupsOswald Buddenhagen2010-09-013-5/+5
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-08-319-3/+182
|\ \
| * | Add missing license headersJoona Petrell2010-08-313-0/+120
| * | Fix application exiting in embedded qml examplesJoona Petrell2010-08-309-3/+62
* | | Merge branch '4.7' of ../msculls-modelview-qdoc-enhancement into 4.7David Boddie2010-08-3039-552/+182
|\ \ \ | |/ / |/| |
| * | fixed compilation problemRoland Wolf2010-07-302-7/+13
| * | added missing filesRoland Wolf2010-07-304-0/+318
| * | added missing filesRoland Wolf2010-07-302-0/+119
| * | moving over work from 28b49e42f5bddec2d62e957f158cb848da134db8Roland Wolf2010-07-2939-941/+128