summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into mast...Qt Continuous Integration System2010-02-2320-1/+3092
|\
| * Merge remote branch 'origin/master' into bearermanagement/unit-testsAaron McCarthy2010-02-2286-465/+706
| |\
| * \ Merge remote branch 'origin/master' into bearermanagement/unit-testsAaron McCarthy2010-02-173-98/+98
| |\ \
| * \ \ Merge remote branch 'origin/master' into bearermanagement/integrationAaron McCarthy2010-02-14324-1/+12534
| |\ \ \
| * \ \ \ Merge remote branch 'origin/master' into bearermanagement/integrationAaron McCarthy2010-02-1155-1362/+524
| |\ \ \ \
| * \ \ \ \ Merge remote branch 'origin/4.6' into bearermanagement/integrationAaron McCarthy2010-02-1117-20/+29
| |\ \ \ \ \
| * | | | | | Display session statistics.Aaron McCarthy2010-02-083-4/+69
| * | | | | | Merge commit 'origin/4.6' into bearermanagement/integration-4Aaron McCarthy2010-01-291133-1487/+1560
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge commit 'BearerIntegration-4' into bearermanagement/integration-4Aaron McCarthy2010-01-293-211/+219
| |\ \ \ \ \ \ \
| | * | | | | | | Bearer Management Integration 4.Aaron McCarthy2010-01-293-211/+219
| * | | | | | | | Merge branch 'bearermanagement/corewlan' into bearermanagement/integration-2Aaron McCarthy2010-01-0513-32/+25
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Fix up license headers.Aaron McCarthy2009-12-2210-10/+10
| | * | | | | | | Make compile.Aaron McCarthy2009-12-227-40/+14
| * | | | | | | | Bearer Management Integration 2.Aaron McCarthy2010-01-045-28/+26
| |/ / / / / / /
| * | | | | | | Bearer Management Integration 1.Aaron McCarthy2009-12-2219-0/+3027
* | | | | | | | 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 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