Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.... | Qt Continuous Integration System | 2010-05-19 | 137 | -16997/+16 |
|\ | |||||
| * | Removed mediaservices. | Kurt Korbatits | 2010-05-18 | 137 | -16995/+16 |
* | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6 | Olivier Goffart | 2010-05-17 | 9 | -453/+659 |
|\ \ | |||||
| * \ | Merge branch '4.6' of S:\sync\git\trolltech\qt-s60-public.git\ into 4.6 | Gareth Stockwell | 2010-05-11 | 2 | -0/+20 |
| |\ \ | |||||
| | * \ | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr... | Qt Continuous Integration System | 2010-05-10 | 8 | -453/+649 |
| | |\ \ | |||||
| | * | | | Update to low-level audio documentation. | Kurt Korbatits | 2010-05-09 | 2 | -0/+20 |
| * | | | | Fixed typo in QAudioInput bufferSize documentation | Gareth Stockwell | 2010-05-11 | 1 | -2/+2 |
| | |/ / | |/| | | |||||
| * | | | Return correct formats supported lists from Symbian audio backend | Gareth Stockwell | 2010-05-10 | 8 | -453/+649 |
| |/ / | |||||
* | | | Compile with opengl enabled. | Warwick Allison | 2010-05-07 | 1 | -0/+2 |
| |/ |/| | |||||
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-05-02 | 1 | -7/+7 |
|\ \ | |||||
| * \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-05-01 | 1 | -7/+7 |
| |\ \ | |||||
| | * | | Fix QT_NO_LIBRARY | Tasuku Suzuki | 2010-04-29 | 1 | -7/+7 |
* | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in... | Qt Continuous Integration System | 2010-04-30 | 6 | -94/+74 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6 | Thiago Macieira | 2010-04-29 | 6 | -92/+71 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | win32 backend for low-level audio fixes | Kurt Korbatits | 2010-04-26 | 4 | -78/+67 |
| | * | | Disable notify() signal when setNotifyInterval is zero in alsa backend. | Kurt Korbatits | 2010-04-23 | 2 | -14/+4 |
| * | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in... | Qt Continuous Integration System | 2010-04-27 | 3 | -6/+7 |
| |\ \ \ | | |_|/ | |/| | | |||||
| | * | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in... | Qt Continuous Integration System | 2010-04-25 | 3 | -6/+7 |
| | |\ \ | |||||
| | | * \ | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in... | Qt Continuous Integration System | 2010-04-23 | 3 | -6/+7 |
| | | |\ \ | |||||
| | | | * \ | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6 | Thiago Macieira | 2010-04-21 | 3 | -6/+7 |
| | | | |\ \ | | | | | |/ | |||||
| | | | | * | QAudioOutput always uses default output device | Kurt Korbatits | 2010-04-21 | 1 | -4/+3 |
| | | | | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.... | Qt Continuous Integration System | 2010-04-19 | 2 | -2/+4 |
| | | | | |\ | |||||
| | | | | | * | Bug in QAudioOutput: Invalid use of "waveOutUnprepareHeader" | Kurt Korbatits | 2010-04-19 | 2 | -2/+4 |
* | | | | | | | Fix qdoc error in low-level audio | Kurt Korbatits | 2010-04-27 | 1 | -2/+2 |
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7 | Kurt Korbatits | 2010-04-27 | 1 | -1/+5 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging int... | Justin McPherson | 2010-04-27 | 1 | -9/+9 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | MediaServices; Don't look at the debug info when looking for plugins. | Justin McPherson | 2010-04-27 | 1 | -1/+5 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | update multimedia qml element doc samples | Kurt Korbatits | 2010-04-27 | 1 | -5/+7 |
| |/ / / / / |/| | | | | | |||||
* | | | | | | Fix up qdocs for mediaservices namespace. | Kurt Korbatits | 2010-04-27 | 1 | -9/+9 |
|/ / / / / | |||||
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.... | Qt Continuous Integration System | 2010-04-23 | 137 | -262/+311 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Multimedia causes build failure when Qt is configured with -embedded | Kurt Korbatits | 2010-04-21 | 1 | -1/+19 |
| * | | | | Disabled QMediaPlayer states debug output. | Dmytro Poplavskiy | 2010-04-19 | 1 | -1/+1 |
| * | | | | Fixed typo in QMediaPlayer::play() error reporting | Dmytro Poplavskiy | 2010-04-19 | 1 | -3/+3 |
| * | | | | Fix warning about illegal empty declaration. | Andrew den Exter | 2010-04-19 | 1 | -1/+1 |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.... | Qt Continuous Integration System | 2010-04-18 | 137 | -258/+289 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | Three fixes from Shane after QtMultimedia was split into two dlls. | Espen Riskedal | 2010-04-16 | 2 | -2/+12 |
| | * | | | Add EXPORT defines for QtMediaServices library. | Andrew den Exter | 2010-04-16 | 26 | -41/+41 |
| | * | | | QtMediaservices -> QtMediaServices. | Justin McPherson | 2010-04-16 | 69 | -202/+202 |
| | * | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging int... | Justin McPherson | 2010-04-16 | 1 | -1/+1 |
| | |\ \ \ | |||||
| | | * | | | Fixed compile errors in pulseaudio backend for soundeffect | Kurt Korbatits | 2010-04-16 | 1 | -1/+1 |
| | * | | | | Merge branch '4.7' of ../../qt/4.7 into 4.7 | Justin McPherson | 2010-04-16 | 3 | -1/+23 |
| | |\ \ \ \ | | | |/ / / | | |/| | | | |||||
| | * | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging int... | Justin McPherson | 2010-04-15 | 1 | -1/+1 |
| | |\ \ \ \ | |||||
| | * | | | | | Create Mediaservices lib, separate from Multimedia. | Justin McPherson | 2010-04-15 | 137 | -218/+239 |
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-04-17 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | More QML doc consistency. | Martin Jones | 2010-04-16 | 1 | -2/+2 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6 | Olivier Goffart | 2010-04-16 | 1 | -2/+2 |
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | | | |||||
| * | | | | Fixed compiler warning | Gareth Stockwell | 2010-04-15 | 1 | -2/+2 |
* | | | | | Fix compile error with QT_NO_GRAPHICSVIEW in QtMultimedia | Tasuku Suzuki | 2010-04-15 | 3 | -1/+23 |
| |_|/ / |/| | | | |||||
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7 | Alan Alpert | 2010-04-14 | 1 | -0/+18 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in... | Qt Continuous Integration System | 2010-04-14 | 1 | -0/+18 |
| |\ \ \ |