summaryrefslogtreecommitdiffstats
path: root/demos
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging int...Justin McPherson2010-04-1513-279/+302
|\
| * Fix GridView.onRemove animation in photoviewer.Yann Bodson2010-04-141-2/+2
| * Reduce QML runtime capabilities to NetworkServices and ReadUserDataJoona Petrell2010-04-141-1/+1
| * Minehunt cleanup/optimization.Michael Brasser2010-04-147-134/+125
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-135-142/+174
| |\
| | * Make demo code more consistent with example code in terms of variableBea Lam2010-04-135-142/+174
* | | Create Mediaservices lib, separate from Multimedia.Justin McPherson2010-04-154-9/+9
|/ /
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-04-131-1/+0
|\ \
| * | Remove not needed permissionsThomas Zander2010-04-121-1/+0
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-04-131-0/+3
|\ \ \ | |_|/ |/| |
| * | Allow building Qt without the QtGui moduleBernhard Rosenkraenzer2010-04-071-0/+3
| |/
* | Enable other wrapping modes.Martin Jones2010-04-091-1/+1
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-094-46/+39
|\ \
| * | Remove use of obsolete "Script" element.Warwick Allison2010-04-094-46/+39
* | | TextEdit::wrap changed to TextEdit::wrapMode enumerationMartin Jones2010-04-092-2/+2
|/ /
* | Text.wrap is deprecatedYann Bodson2010-04-092-17/+18
* | Replace "property var " with "property variant " in QML codeAaron Kennedy2010-04-097-8/+8
* | Warn if the minehunt C++ plugin is not compiled.Yann Bodson2010-04-081-0/+7
* | Add tab navigation to twitter example authentication screen.Yann Bodson2010-04-081-5/+8
* | Renamed 'source' property from SpringFollow to 'to'Leonardo Sobral Cunha2010-04-081-2/+2
* | Add running of examples to quality gate.Warwick Allison2010-04-082-2/+2
* | Replace "import Qt 4.6" with "import Qt 4.7"Michael Brasser2010-04-0854-54/+54
* | Remove flickr-desktopYann Bodson2010-04-086-500/+1
* | 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