summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'origin/4.6' into bearermanagement/integration-4Aaron McCarthy2010-01-291133-1487/+1560
|\
| * Don't use QDebug references. Instead, pass by value.Thiago Macieira2010-01-262-2/+2
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6-i...Qt Continuous Integration System2010-01-143-12/+12
| |\
| | * Revert "Frequency to SampleRate and channels to channelCount."Kurt Korbatits2010-01-141-6/+6
| | * Revert "Added setChannelCount() to QAudioFormat."Kurt Korbatits2010-01-143-6/+6
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6David Boddie2010-01-135-20/+31
| |\ \
| | * \ Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2010-01-131121-1225/+1241
| | |\ \ | | | |/
| | | * Modifies the google chat example to use the DOM APIPierre Rossi2010-01-123-18/+29
| | | * Added the 'framecapture' WebKit example to the default build.Andre Pedralho2010-01-111-1/+2
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-01-091-1/+0
| | |\ \
| | | * | Doc typos fixedJarek Kobus2010-01-081-1/+0
| * | | | Doc: Resized the window and added a title.David Boddie2010-01-121-160/+161
| * | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6David Boddie2010-01-117-18/+34
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-091119-1206/+1210
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2010-01-083-16/+16
| | | |\ \ | | | | |/
| | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-01-084-2/+18
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Added UIDs and icons to some webkit examplesMiikka Heikkinen2010-01-074-2/+18
| | * | | Merge branch '4.6' of ../../4.6 into 4.6Justin McPherson2010-01-077-71/+86
| | |\ \ \ | | | |/ /
| | * | | Frequency to SampleRate and channels to channelCount.Kurt Korbatits2010-01-063-8/+8
| | * | | Added setChannelCount() to QAudioFormat.Kurt Korbatits2010-01-063-4/+4
| * | | | Doc: Added a missing example to the list of Graphics View examples.David Boddie2010-01-111-0/+1
| | |_|/ | |/| |
| * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6David Boddie2010-01-071119-1140/+1140
| |\ \ \
| | * | | Use the lowercase/shortname.h headers for Phonon includesThiago Macieira2010-01-062-13/+13
| | * | | Update copyright year to 2010Jason McDonald2010-01-061119-1127/+1127
| | | |/ | | |/|
| * | | Doc: Made coding style changes to the Audio Input and Output examples.David Boddie2010-01-063-66/+70
| |/ /
| * | Merge remote branch 'staging/4.6' into 4.6Simon Hausmann2009-12-177-75/+90
| |\ \ | | |/ | |/|
| | * Doc: Modified the coding style of the Audio Devices example.David Boddie2009-12-154-69/+84
| | * Change some examples of Webkit to create the mainwindow on the stackBenjamin Poulain2009-12-143-6/+6
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6Justin McPherson2009-12-142-1/+23
| |\ \ | | |/ | |/|
| | * audioinput and audiooutput examples not using isFormatSupportedKurt Korbatits2009-12-072-1/+23
| * | Merge oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-12-091-2/+2
| |\ \
| | * \ Merge commit 'origin/4.6' into 4.6Olivier Goffart2009-12-047-22/+25
| | |\ \
| | * \ \ Merge branch 'ooo-sequential' of git://gitorious.org/~fleury/qt/fleury-openbo...Jan-Arve Sæther2009-12-011-2/+2
| | |\ \ \
| | | * | | QGAL (Test): Fix memory leaks in example and testsEduardo M. Fleury2009-11-271-2/+2
| * | | | | Stylesheets example: Fix warning about multiple &-mnemonics.Friedemann Kleint2009-12-041-1/+1
| | |_|/ / | |/| | |
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-11-294-13/+17
| |\ \ \ \ | | |/ / /
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-11-271-1/+1
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | create application object in qsdbg exampleKent Hansen2009-11-261-0/+3
| * | | | rename .qs files to .jsKent Hansen2009-11-265-3/+3
| * | | | Use a pixmap instead of an image in the tablet exampleBenjamin Poulain2009-11-252-19/+19
* | | | | 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
| |_|/ / |/| | |
* | | | Merge commit oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-11-274-13/+17
|\ \ \ \ | |_|/ / |/| | |
| * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-st...axis2009-11-263-11/+14
| |\ \ \
| | * | | Made layout of the Softkeys example more compactMiikka Heikkinen2009-11-262-9/+9