summaryrefslogtreecommitdiffstats
path: root/demos
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-1522-25/+398
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | Import "content" with as qualifier to support network without qmldirmae2010-03-151-5/+5
| * | | | | | | | | Small fixes to photoviewer demoYann Bodson2010-03-152-12/+14
| * | | | | | | | | Add busy indicator to photoviewer demoYann Bodson2010-03-155-2/+18
| * | | | | | | | | Add new declarative photoviewer demoYann Bodson2010-03-1212-0/+354
| * | | | | | | | | Replace QDeclarativeContext::addDefaultObject() -> setContextObject()Aaron Kennedy2010-03-111-1/+1
| * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-114-0/+4
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Move particles in their own plugin (Qt.labs.particles)Yann Bodson2010-03-114-0/+4
| * | | | | | | | | | Truncate title at right if too long (cannot currently ElideRight and center).Warwick Allison2010-03-111-3/+1
| |/ / / / / / / / /
| * | | | | | | | | Document - and use - the qmlRegisterXXX template functionsmae2010-03-101-3/+2
| * | | | | | | | | Use no-version-specified to mean any version (used to work, fixed again,Warwick Allison2010-03-102-13/+13
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-154-4/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | / | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Fix build break caused by undefined symbol SetDialogPreferenceMiikka Heikkinen2010-03-104-4/+4
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-081-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | fix to mainwindow demoThierry Bastian2010-03-081-1/+1
* | | | | | | | | Use a better method for installing declarative demos.Rohan McGovern2010-03-087-76/+16
* | | | | | | | | Fixed declarative demos not being installed.Rohan McGovern2010-03-088-0/+93
* | | | | | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Rohan McGovern2010-03-061-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| / / / / / / / | |/ / / / / / /
| * | | | | | | SqlBrowser not respecting casings.Bill King2010-03-041-1/+1
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-052-2/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Doc: Enabled the context menu in the spreadsheet demo.David Boddie2010-03-041-0/+1
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-041-2/+0
| |\ \ \ \ \ \ \ \