summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/master' into bearermanagement/stagingAaron McCarthy2010-02-2371-114/+218
|\
| * Updated based on change to transformOrignNigel Hietala2010-02-225-0/+5
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-2266-114/+213
| |\
| | * Replace QmlList* and QList* support with a single QmlListProperty typeAaron Kennedy2010-02-2225-57/+156
| | * Rename MouseRegion -> MouseAreaMartin Jones2010-02-2241-57/+57
* | | Merge remote branch 'origin/master' into bearermanagement/unit-testsAaron McCarthy2010-02-2286-465/+706
|\ \ \ | |/ /
| * | Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-2027-41/+177
| |\ \ | | |/
| | * Fix dynamic exampleAlan Alpert2010-02-191-0/+1
| | * More strict type checking of ListElement properties.Warwick Allison2010-02-192-3/+3
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtMartin Jones2010-02-1857-86/+86
| | |\
| | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-1820-37/+37
| | |\ \
| | | * | Get rid of the matchProperties/properties distinction, as itMichael Brasser2010-02-1820-37/+37
| | * | | QmlView API review. See QmlChanges.txt for details.Martin Jones2010-02-182-2/+2
| | |/ /
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-174-0/+135
| | |\ \
| | | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-161-1/+2
| | | |\ \
| | | * | | Add QmlImageProvider to allow asynchronous access to images.Martin Jones2010-02-164-0/+135
| * | | | | Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-202-2/+3
| |\ \ \ \ \
| | * | | | | Pass QAudioDeviceInfo when creating audio input/output in examplesGareth Stockwell2010-02-182-2/+3
| * | | | | | Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-1856-85/+85
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-1656-85/+85
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | | * | | | Fix copyright year.Jason McDonald2010-02-1655-55/+55
| | | * | | | Fix broken license headers.Jason McDonald2010-02-162-30/+30
| | | | |_|/ | | | |/| |
| * | | | | Merge branch 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-02-174-339/+443
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Merge branch '4.6' into qt-master-from-4.6Thiago Macieira2010-02-174-339/+443
| | |\ \ \ \ | | | |/ / / | | |/| / / | | | |/ /
| | | * | Changed function names in audio input example to clarify meaningGareth Stockwell2010-02-162-6/+7
| | | * | Tidied up debug output in audio input exampleGareth Stockwell2010-02-161-3/+5
| | | * | Removed redundant strings from audio input exampleGareth Stockwell2010-02-162-8/+18
| | | * | Cleaned up memory management in audio input exampleGareth Stockwell2010-02-162-36/+54
| | | * | Changed variable names in audio input example to match Qt code styleGareth Stockwell2010-02-162-93/+93
| | | * | Made level calculation in audio input example work for all formatsGareth Stockwell2010-02-162-42/+80
| | | * | Removed unused variable from audio input exampleGareth Stockwell2010-02-162-7/+3
| | | * | Update suspend/resume button label in audio input exampleGareth Stockwell2010-02-161-0/+2
| | | * | Changed function names in audio output example to clarify meaningGareth Stockwell2010-02-162-23/+20
| | | * | Cleaned up implementation of audio output exampleGareth Stockwell2010-02-161-17/+10
| | | * | Tidied up debug output in audio output exampleGareth Stockwell2010-02-162-7/+9
| | | * | Removed redundant strings from audio output exampleGareth Stockwell2010-02-162-13/+24
| | | * | Cleaned up memory management in audio output exampleGareth Stockwell2010-02-162-38/+61
| | | * | Changed variable names in audio output example to match Qt code styleGareth Stockwell2010-02-162-92/+92
| | | * | Made data generation in audio output example work for all formatsGareth Stockwell2010-02-162-72/+75
| | | * | Update suspend/resume button label in audio output exampleGareth Stockwell2010-02-161-0/+2
| | | * | Added missing override in audio output exampleGareth Stockwell2010-02-162-0/+6
* | | | | Merge remote branch 'origin/master' into bearermanagement/unit-testsAaron McCarthy2010-02-173-98/+98
|\ \ \ \ \ | |/ / / /
| * | | | fix line endingsOswald Buddenhagen2010-02-163-98/+98
| |/ / /
* | | | Merge remote branch 'origin/master' into bearermanagement/integrationAaron McCarthy2010-02-14324-1/+12534
|\ \ \ \ | |/ / /
| * | | Compile fix for OSX.Roberto Raggi2010-02-121-1/+2
| | |/ | |/|
| * | Removed "running: true" for animations used as propertyvaluesourceLeonardo Sobral Cunha2010-02-1112-20/+19
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-10324-1/+12534
| |\ \
| | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-09324-1/+12534
| | |\ \
| | | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-05324-1/+12534
| | | |\ \
| | | | * \ Merge branch 'kinetic-declarativeui' of git://git-nokia.trolltech.com.au/qtso...Warwick Allison2010-02-04324-1/+12534
| | | | |\ \