summaryrefslogtreecommitdiffstats
path: root/src/multimedia
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-05-021-7/+7
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-05-011-7/+7
| |\
| | * Fix QT_NO_LIBRARYTasuku Suzuki2010-04-291-7/+7
* | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-04-306-94/+74
|\ \ \ | |/ / |/| |
| * | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-04-296-92/+71
| |\ \
| | * | win32 backend for low-level audio fixesKurt Korbatits2010-04-264-78/+67
| | * | Disable notify() signal when setNotifyInterval is zero in alsa backend.Kurt Korbatits2010-04-232-14/+4
| * | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-04-273-6/+7
| |\ \ \ | | |_|/ | |/| |
| | * | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-04-253-6/+7
| | |\ \
| | | * \ Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-04-233-6/+7
| | | |\ \
| | | | * \ Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-04-213-6/+7
| | | | |\ \ | | | | | |/
| | | | | * QAudioOutput always uses default output deviceKurt Korbatits2010-04-211-4/+3
| | | | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-192-2/+4
| | | | | |\
| | | | | | * Bug in QAudioOutput: Invalid use of "waveOutUnprepareHeader"Kurt Korbatits2010-04-192-2/+4
* | | | | | | Fix qdoc error in low-level audioKurt Korbatits2010-04-271-2/+2
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7Kurt Korbatits2010-04-271-1/+5
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging int...Justin McPherson2010-04-271-9/+9
| |\ \ \ \ \ \
| * | | | | | | MediaServices; Don't look at the debug info when looking for plugins.Justin McPherson2010-04-271-1/+5
| | |/ / / / / | |/| | | | |
* | | | | | | update multimedia qml element doc samplesKurt Korbatits2010-04-271-5/+7
| |/ / / / / |/| | | | |
* | | | | | Fix up qdocs for mediaservices namespace.Kurt Korbatits2010-04-271-9/+9
|/ / / / /
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-23137-262/+311
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Multimedia causes build failure when Qt is configured with -embeddedKurt Korbatits2010-04-211-1/+19
| * | | | Disabled QMediaPlayer states debug output.Dmytro Poplavskiy2010-04-191-1/+1
| * | | | Fixed typo in QMediaPlayer::play() error reportingDmytro Poplavskiy2010-04-191-3/+3
| * | | | Fix warning about illegal empty declaration.Andrew den Exter2010-04-191-1/+1
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-18137-258/+289
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Three fixes from Shane after QtMultimedia was split into two dlls.Espen Riskedal2010-04-162-2/+12
| | * | | Add EXPORT defines for QtMediaServices library.Andrew den Exter2010-04-1626-41/+41
| | * | | QtMediaservices -> QtMediaServices.Justin McPherson2010-04-1669-202/+202
| | * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging int...Justin McPherson2010-04-161-1/+1
| | |\ \ \
| | | * | | Fixed compile errors in pulseaudio backend for soundeffectKurt Korbatits2010-04-161-1/+1
| | * | | | Merge branch '4.7' of ../../qt/4.7 into 4.7Justin McPherson2010-04-163-1/+23
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging int...Justin McPherson2010-04-151-1/+1
| | |\ \ \ \
| | * | | | | Create Mediaservices lib, separate from Multimedia.Justin McPherson2010-04-15137-218/+239
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-171-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | More QML doc consistency.Martin Jones2010-04-161-2/+2
| | |_|/ / / | |/| | | |
* | | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-04-161-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | |
| * | | | Fixed compiler warningGareth Stockwell2010-04-151-2/+2
* | | | | Fix compile error with QT_NO_GRAPHICSVIEW in QtMultimediaTasuku Suzuki2010-04-153-1/+23
| |_|/ / |/| | |
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Alan Alpert2010-04-141-0/+18
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-04-141-0/+18
| |\ \ \
| | * \ \ Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-04-131-0/+18
| | |\ \ \ | | | |/ /
| | | * | Document Symbian platform security requirements on Qt APIsFrans Englich2010-04-121-0/+18
| | | |/
* | | | Rename remaining import Qt 4.6 lines to import Qt 4.7Joona Petrell2010-04-141-1/+1
|/ / /
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-04-122-0/+11
|\ \ \ | |/ / |/| |
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-04-102-0/+11
| |\ \
| | * | Fix compile error with QT_NO_LIBRARY in QtMultimediaTasuku Suzuki2010-04-091-0/+2
| | * | Compile on 10.4.Morten Johan Sørvig2010-04-081-0/+9
* | | | Add meta-data keys for embedded images.Andrew den Exter2010-04-122-1/+10
|/ / /
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-102-2/+24
|\ \ \