summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.6'Thiago Macieira2010-01-083-16/+16
|\
| * 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
* | | Merge branch '4.6'Thiago Macieira2009-12-266-73/+88
|\ \ \ | | |/ | |/|
| * | 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 commit 'origin/4.6'Olivier Goffart2009-12-153-3/+25
|\ \ \ | |/ /
| * | 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
* | | | | | Merge branch '4.6'Thiago Macieira2009-12-081-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Stylesheets example: Fix warning about multiple &-mnemonics.Friedemann Kleint2009-12-041-1/+1
| | |_|/ / | |/| | |
* | | | | Fix memory leakDavid Faure2009-12-071-0/+1
* | | | | Merge branch '4.6'Thiago Macieira2009-12-0211-35/+42
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-11-294-13/+17
| |\ \ \ \ | | |/ / /
| | * | | 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
| | | | * | Fix for "saxbookmarks - file dialog starts in wrong directory (winscw)"Janne Anttila2009-11-251-2/+5
| | | * | | Fixes performance problem with scribble avoiding to redraw whole screen on ev...Daniil Ivanov2009-11-261-2/+3
| * | | | | 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 branch '4.6'Thiago Macieira2009-11-25104-902/+351
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6David Boddie2009-11-251-1/+1
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / /
| | * | | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-257-26/+33
| | |\ \ \
| | * | | | StandardDialogs example: Fix warning about QKeySequence::mnemonic.Friedemann Kleint2009-11-251-1/+1
| * | | | | Fix Broadcast receiver example.Jedrzej Nowacki2009-11-251-1/+1
| | |/ / / | |/| | |
| * | | | Namespace build fails for webkit exampleRichard Moe Gustavsen2009-11-241-0/+2
| | |/ / | |/| |
| * | | A few tweaks to the frozen column examplePierre Rossi2009-11-233-2/+11
| * | | Merge commit '01fec63b7b8f8cae94f92fca1d806fe8c6156299' of oslo-staging-1 int...Simon Hausmann2009-11-233-24/+20
| |\ \ \ | | |/ / | |/| |
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-11-202-7/+1
| | |\ \
| | * | | Fixing the frame hierarchy traversing in framecapture WebKit example.Andre Pedralho2009-11-192-21/+18
| | * | | Updated the 'framecapture' WebKit example according to WebKit API changes.Andre Pedralho2009-11-192-4/+3
| * | | | Merge commit 'd9fa92' into origin-4.6Olivier Goffart2009-11-201-0/+2
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-st...axis2009-11-201-0/+2
| | |\ \ \
| | | * | | Enabled Qt icon in Symbian also for demos/examples without UID3.Janne Anttila2009-11-191-1/+1
| | | * | | Added default Qt icon back for Qt demos/examples in Symbian.Janne Anttila2009-11-191-0/+2
| | * | | | Merge upstream/4.6 into oslo-staging-2/4.6Olivier Goffart2009-11-195-27/+27
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Fixed effects.pro after customshader demo removalGabriel de Dietrich2009-11-191-6/+0
| * | | | | Use a lowercase name for the binary of the Form Extractor exampleBenjamin Poulain2009-11-191-1/+1
| * | | | | Fix build breakage in 1b14c3d33dea0fe4814f2749c49cf916ca13e012Jason McDonald2009-11-191-6/+0
| | |_|/ / | |/| | |
| * | | | Merge branch '4.6' of oslo-staging-1 into 4.6Simon Hausmann2009-11-193-5/+8
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Fix compilation with Sun CC: no semi-colon after Q_PROPERTYThiago Macieira2009-11-181-1/+1