summaryrefslogtreecommitdiffstats
path: root/src/multimedia
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging int...Justin McPherson2010-04-271-9/+9
|\
| * Fix up qdocs for mediaservices namespace.Kurt Korbatits2010-04-271-9/+9
* | MediaServices; Don't look at the debug info when looking for plugins.Justin McPherson2010-04-271-1/+5
|/
* 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
|\ \ \
| * | | Reimplemented event() and sceneEvent() in video item, for BC.Dmytro Poplavskiy2010-04-082-2/+24
| |/ /
* | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-04-097-26/+76
|\ \ \ | |/ / |/| / | |/
| * Corruption in data captured by QAudioInputKurt Korbatits2010-04-091-2/+2
| * Just one (static) waveInCriticalSection but multiple QAudioInput toKurt Korbatits2010-04-094-11/+11
| * Mismatch between reported and actual supported sample rates inKurt Korbatits2010-04-071-11/+63
| * QAudioInput: possible change of state without emitting stateChange()Kurt Korbatits2010-04-062-2/+1
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-011-9/+16
|\ \
| * | Add media elements to the QML Elements docs.Martin Jones2010-04-011-9/+16
* | | Merge remote branch 'integration/qt-4.7-from-4.6' into 4.7Olivier Goffart2010-03-311-10/+14
|\ \ \ | |/ /
| * | Fixed incorrectly clipped video when rendered on QGLWidgetDmytro Poplavskiy2010-03-311-10/+14
* | | Merge remote branch 'origin/4.7' into 4.7Olivier Goffart2010-03-307-32/+440
|\ \ \ | |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-03-307-32/+440
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7Dmytro Poplavskiy2010-03-301-7/+27
| | |\ \
| | | * | Remove debug code disabling the video widget output control.Andrew den Exter2010-03-301-1/+0
| | | * | Force a repaint on changes in the native size of video frames.Andrew den Exter2010-03-301-0/+2
| | | * | Don't fill the video widget borders or background by default.Andrew den Exter2010-03-301-7/+26
| | * | | Fixed compilation on 64 bits Mac OS 10.5Dmytro Poplavskiy2010-03-301-1/+1
| | |/ /