Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '4.6' | Thiago Macieira | 2010-01-08 | 3 | -16/+16 |
|\ | |||||
| * | Merge branch '4.6' of ../../4.6 into 4.6 | Justin McPherson | 2010-01-07 | 7 | -71/+86 |
| |\ | |||||
| * | | Frequency to SampleRate and channels to channelCount. | Kurt Korbatits | 2010-01-06 | 3 | -8/+8 |
| * | | Added setChannelCount() to QAudioFormat. | Kurt Korbatits | 2010-01-06 | 3 | -4/+4 |
* | | | Merge branch '4.6' | Thiago Macieira | 2009-12-26 | 6 | -73/+88 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge remote branch 'staging/4.6' into 4.6 | Simon Hausmann | 2009-12-17 | 7 | -75/+90 |
| |\ \ | | |/ | |/| | |||||
| | * | Doc: Modified the coding style of the Audio Devices example. | David Boddie | 2009-12-15 | 4 | -69/+84 |
| | * | Change some examples of Webkit to create the mainwindow on the stack | Benjamin Poulain | 2009-12-14 | 3 | -6/+6 |
* | | | Merge commit 'origin/4.6' | Olivier Goffart | 2009-12-15 | 3 | -3/+25 |
|\ \ \ | |/ / | |||||
| * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6 | Justin McPherson | 2009-12-14 | 2 | -1/+23 |
| |\ \ | | |/ | |/| | |||||
| | * | audioinput and audiooutput examples not using isFormatSupported | Kurt Korbatits | 2009-12-07 | 2 | -1/+23 |
| * | | Merge oslo-staging-2/4.6 into upstream/4.6 | Olivier Goffart | 2009-12-09 | 1 | -2/+2 |
| |\ \ | |||||
| | * \ | Merge commit 'origin/4.6' into 4.6 | Olivier Goffart | 2009-12-04 | 7 | -22/+25 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'ooo-sequential' of git://gitorious.org/~fleury/qt/fleury-openbo... | Jan-Arve Sæther | 2009-12-01 | 1 | -2/+2 |
| | |\ \ \ | |||||
| | | * | | | QGAL (Test): Fix memory leaks in example and tests | Eduardo M. Fleury | 2009-11-27 | 1 | -2/+2 |
* | | | | | | Merge branch '4.6' | Thiago Macieira | 2009-12-08 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Stylesheets example: Fix warning about multiple &-mnemonics. | Friedemann Kleint | 2009-12-04 | 1 | -1/+1 |
| | |_|/ / | |/| | | | |||||
* | | | | | Fix memory leak | David Faure | 2009-12-07 | 1 | -0/+1 |
* | | | | | Merge branch '4.6' | Thiago Macieira | 2009-12-02 | 11 | -35/+42 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6 | Simon Hausmann | 2009-11-29 | 4 | -13/+17 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge commit oslo-staging-2/4.6 into upstream/4.6 | Olivier Goffart | 2009-11-27 | 4 | -13/+17 |
| | |\ \ \ | | | |/ / | | |/| | | |||||
| | | * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-st... | axis | 2009-11-26 | 3 | -11/+14 |
| | | |\ \ | |||||
| | | | * | | Made layout of the Softkeys example more compact | Miikka Heikkinen | 2009-11-26 | 2 | -9/+9 |
| | | | * | | Fix for "saxbookmarks - file dialog starts in wrong directory (winscw)" | Janne Anttila | 2009-11-25 | 1 | -2/+5 |
| | | * | | | Fixes performance problem with scribble avoiding to redraw whole screen on ev... | Daniil Ivanov | 2009-11-26 | 1 | -2/+3 |
| * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6 | Simon Hausmann | 2009-11-27 | 1 | -1/+1 |
| |\ \ \ \ \ | | |/ / / / | |||||
| * | | | | | create application object in qsdbg example | Kent Hansen | 2009-11-26 | 1 | -0/+3 |
| * | | | | | rename .qs files to .js | Kent Hansen | 2009-11-26 | 5 | -3/+3 |
| * | | | | | Use a pixmap instead of an image in the tablet example | Benjamin Poulain | 2009-11-25 | 2 | -19/+19 |
* | | | | | | Merge branch '4.6' | Thiago Macieira | 2009-11-25 | 104 | -902/+351 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6 | David Boddie | 2009-11-25 | 1 | -1/+1 |
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / / | |||||
| | * | | | Merge remote branch 'mainline/4.6' into 4.6 | Oswald Buddenhagen | 2009-11-25 | 7 | -26/+33 |
| | |\ \ \ | |||||
| | * | | | | StandardDialogs example: Fix warning about QKeySequence::mnemonic. | Friedemann Kleint | 2009-11-25 | 1 | -1/+1 |
| * | | | | | Fix Broadcast receiver example. | Jedrzej Nowacki | 2009-11-25 | 1 | -1/+1 |
| | |/ / / | |/| | | | |||||
| * | | | | Namespace build fails for webkit example | Richard Moe Gustavsen | 2009-11-24 | 1 | -0/+2 |
| | |/ / | |/| | | |||||
| * | | | A few tweaks to the frozen column example | Pierre Rossi | 2009-11-23 | 3 | -2/+11 |
| * | | | Merge commit '01fec63b7b8f8cae94f92fca1d806fe8c6156299' of oslo-staging-1 int... | Simon Hausmann | 2009-11-23 | 3 | -24/+20 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6 | Simon Hausmann | 2009-11-20 | 2 | -7/+1 |
| | |\ \ | |||||
| | * | | | Fixing the frame hierarchy traversing in framecapture WebKit example. | Andre Pedralho | 2009-11-19 | 2 | -21/+18 |
| | * | | | Updated the 'framecapture' WebKit example according to WebKit API changes. | Andre Pedralho | 2009-11-19 | 2 | -4/+3 |
| * | | | | Merge commit 'd9fa92' into origin-4.6 | Olivier Goffart | 2009-11-20 | 1 | -0/+2 |
| |\ \ \ \ | | |_|/ / | |/| | | | |||||
| | * | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-st... | axis | 2009-11-20 | 1 | -0/+2 |
| | |\ \ \ | |||||
| | | * | | | Enabled Qt icon in Symbian also for demos/examples without UID3. | Janne Anttila | 2009-11-19 | 1 | -1/+1 |
| | | * | | | Added default Qt icon back for Qt demos/examples in Symbian. | Janne Anttila | 2009-11-19 | 1 | -0/+2 |
| | * | | | | Merge upstream/4.6 into oslo-staging-2/4.6 | Olivier Goffart | 2009-11-19 | 5 | -27/+27 |
| | |\ \ \ \ | | | |/ / / | | |/| | | | |||||
| | * | | | | Fixed effects.pro after customshader demo removal | Gabriel de Dietrich | 2009-11-19 | 1 | -6/+0 |
| * | | | | | Use a lowercase name for the binary of the Form Extractor example | Benjamin Poulain | 2009-11-19 | 1 | -1/+1 |
| * | | | | | Fix build breakage in 1b14c3d33dea0fe4814f2749c49cf916ca13e012 | Jason McDonald | 2009-11-19 | 1 | -6/+0 |
| | |_|/ / | |/| | | | |||||
| * | | | | Merge branch '4.6' of oslo-staging-1 into 4.6 | Simon Hausmann | 2009-11-19 | 3 | -5/+8 |
| |\ \ \ \ | | |_|/ / | |/| | | | |||||
| | * | | | Fix compilation with Sun CC: no semi-colon after Q_PROPERTY | Thiago Macieira | 2009-11-18 | 1 | -1/+1 |