summaryrefslogtreecommitdiffstats
path: root/demos
Commit message (Expand)AuthorAgeFilesLines
* Cleanup minehunt exampleYann Bodson2010-04-071-160/+114
* Merge remote branch 'origin/4.7' into HEADThiago Macieira2010-04-011-1/+0
|\
| * Remove capability flag not available in public SDKsJoona Petrell2010-04-011-2/+0
* | Merge commit 'origin/4.7' into symbian47Thomas Zander2010-03-312-1/+8
|\ \ | |/
| * Merge remote branch 'origin/4.7' into qt-4.7-from-4.6Thiago Macieira2010-03-301-0/+6
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-03-301-0/+6
| | |\
| | | * Don't fill the video widget borders or background by default.Andrew den Exter2010-03-301-0/+6
| * | | Merge remote branch 'origin/4.7' into qt-4.7-from-4.6Thiago Macieira2010-03-305-4/+19
| |\ \ \ | | |/ /
| * | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-291-1/+2
| |\ \ \ | | |_|/ | |/| |
| | * | Changed pkg_prerules to not use default_deployment for vendor IDMiikka Heikkinen2010-03-261-1/+2
* | | | Fix building on public symbian SDK.Thomas Zander2010-03-301-2/+2
| |_|/ |/| |
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-03-262-9/+24
|\ \ \
| * | | Add Symbian deploy section for qml import pluginsJoona Petrell2010-03-261-0/+15
| |/ /
| * | Merge remote branch 'main/4.7' into 4.7Morten Johan Sørvig2010-03-2524-158/+246
| |\ \
| * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-221-9/+9
| |\ \ \
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-191-9/+9
| | |\ \ \
| | | * \ \ Merge remote branch 'origin/4.7' into oslo-staging-1Aaron McCarthy2010-03-1913-88/+122
| | | |\ \ \
| | | * | | | Remove incorrect semi-colons after Q_PROPERTYThiago Macieira2010-03-181-9/+9
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-03-253-5/+5
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Qt.Infinite -> Animation.InfiniteMichael Brasser2010-03-253-3/+3
| * | | | | | Replace Animation's repeat property with loops.Michael Brasser2010-03-253-5/+5
* | | | | | | Tweak import behaviourAlan Alpert2010-03-254-4/+4
|/ / / / / /
* | | | | | Minehunt readme was missing a step.Alan Alpert2010-03-231-0/+2
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-03-2310-37/+121
|\ \ \ \ \ \
| * | | | | | Usability improvements for photoviewer demo.Yann Bodson2010-03-235-8/+32
| * | | | | | Remove ParentAction.Michael Brasser2010-03-232-8/+12
| * | | | | | Editable tag in photoviewer demo.Yann Bodson2010-03-234-15/+61
| * | | | | | Small photoviewer improvementsYann Bodson2010-03-233-5/+13
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-2214-119/+101
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge branch '4.6-s60' into 4.7-s60axis2010-03-221-4/+6
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | / | | | |_|_|/ | | |/| | |
| | * | | | Useful support for -qtlibinfix configure parameter in SymbianMiikka Heikkinen2010-03-181-4/+6
* | | | | | Use QDeclarativeListProperty properlyAlan Alpert2010-03-231-1/+23
| |_|/ / / |/| | | |
* | | | | Deprecate inline Script {} blocksAaron Kennedy2010-03-2214-119/+101
|/ / / /
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Martin Jones2010-03-1913-88/+122
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-s60axis2010-03-185-3/+16
| |\ \ \ | | |/ /
| | * | Added close button to Anomaly demo browserMiikka Heikkinen2010-03-165-3/+16
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7-s60axis2010-03-164-4/+4
| |\ \ \ | | | |/ | | |/|
| * | | Fix build break caused by undefined symbol SetDialogPreferenceMiikka Heikkinen2010-03-114-4/+4
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-1179-208/+203
| |\ \ \
| * \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-0122-114/+121
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-02-2347-79/+1341
| |\ \ \ \ \
| * | | | | | Changed fluidlauncher deployment to cope with Symbian makefile systemaxis2010-02-231-77/+93
| * | | | | | Implemented recursive "sis" target and enabled sis_targets feature.axis2010-02-232-1/+6
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into merge-w...axis2010-02-191-1/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-02-16149-3/+4886
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60axis2010-02-163-6/+13
| | |\ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qtaxis2010-02-124-6/+15
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| * | | | | | | | | use the proper QMake option to find a shared header fileThomas Zander2010-02-044-4/+4
| * | | | | | | | | Fix linking for armlinkThomas Zander2010-02-041-3/+3
* | | | | | | | | | Add/delete albums in photoviewer.Yann Bodson2010-03-175-24/+95