summaryrefslogtreecommitdiffstats
path: root/demos
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-05-1238-491/+231
|\
| * Flickable small API changes.Yann Bodson2010-05-124-13/+9
| * Expand if available space changes.Warwick Allison2010-05-111-0/+6
| * Cleanup and simplify the webbrowser demo.Yann Bodson2010-05-1136-487/+225
* | Emit numFlagsChangedAlan Alpert2010-05-111-0/+2
|/
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-05-077-14/+18
|\
| * More cleanupYann Bodson2010-05-064-7/+11
| * CleanupYann Bodson2010-05-062-6/+6
| * Use enum for drag.axis in doc and examples.Yann Bodson2010-05-061-1/+1
* | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-05-0517-25/+85
|\ \ | |/
| * Fix i18n example.Yann Bodson2010-05-055-4/+64
| * Use enum rather than string for easing type.Yann Bodson2010-05-0513-21/+21
* | Make component.createObject require a parent argumentAlan Alpert2010-05-052-6/+3
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-304-6/+17
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-292-5/+5
| |\
| | * Remove Component's isReady, isLoading, isError and isNull properties.Bea Lam2010-04-292-5/+5
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-271-1/+1
| |\ \ | | |/
| * | make quitableWarwick Allison2010-04-272-1/+12
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-281-0/+1
|\ \ \ | |_|/ |/| |
| * | When deployed on symbian, give player application the standard QT iconDerick Hawcroft2010-04-271-0/+1
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-272-9/+8
|\ \ \ | |/ / |/| / | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-242-9/+8
| |\
| | * Replace usage of print() with console.log().Michael Brasser2010-04-232-9/+8
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-04-2643-139/+204
|\ \ \ | |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-235-19/+30
| |\ \ | | |/ | |/|
| | * Merge branch '4.7' of ../../qt/4.7 into 4.7Justin McPherson2010-04-223-4/+11
| | |\
| | * | Player demo: load not only local files but playlists and urls passed asDmytro Poplavskiy2010-04-211-5/+16
| | * | Fixed Qt build with mediaservices disabled.Dmytro Poplavskiy2010-04-201-2/+1
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-164-9/+9
| | |\ \
| | | * | QtMediaservices -> QtMediaServices.Justin McPherson2010-04-163-8/+8
| | | * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging int...Justin McPherson2010-04-1513-279/+302
| | | |\ \
| | | * | | Create Mediaservices lib, separate from Multimedia.Justin McPherson2010-04-154-9/+9
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-2138-120/+174
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-04-2126-101/+152
| | |\ \ \ \
| | | * | | | Balance grid items for larger displays.Warwick Allison2010-04-211-1/+2
| | | * | | | CleanupYann Bodson2010-04-2016-99/+0
| | | * | | | Fix API call for multiple tags.Warwick Allison2010-04-201-1/+6
| | | * | | | Add .qmlproject files for declarative demos.Yann Bodson2010-04-209-0/+144
| | * | | | | Make the dynamic creation functions on the Qt objectAlan Alpert2010-04-212-3/+3
| | |/ / / /
| | * | | | Indentation and whitespace fixes in qml's samegame tutorialLeonardo Sobral Cunha2010-04-194-8/+10
| | * | | | QML_DECLARE_TYPE is no longer necessary - fix docs and examplesBea Lam2010-04-191-2/+0
| | * | | | Ensure existing image is gone before next photo selection.Warwick Allison2010-04-161-0/+1
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-163-4/+6
| | |\ \ \ \
| | | * | | | Cleanup photoviewer demo.Yann Bodson2010-04-163-4/+6
| | | |/ / /
| | * | | | Don't use zoomfactor.Warwick Allison2010-04-161-2/+2
| | |/ / /
* | | | | Doc: Fixed typos.David Boddie2010-04-231-1/+1
|/ / / /
* | | | Add (correct) .pro files to INSTALLs.Frans Englich2010-04-212-2/+2
* | | | Assign UID3, install example files, remove redundant code.Frans Englich2010-04-212-6/+11
* | | | Fixed vendor info in fluidlauncher sis package.Miikka Heikkinen2010-04-201-1/+2
|/ / /
* | | Small calculator fix.Yann Bodson2010-04-152-10/+10