summaryrefslogtreecommitdiffstats
path: root/src/multimedia
Commit message (Expand)AuthorAgeFilesLines
* 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
| | |/ /
| | * | Update PulseAudio config.test.Justin McPherson2010-03-291-1/+2
| | * | QuickTime media backend: Render CIImage based video frames directly withDmytro Poplavskiy2010-03-295-24/+411
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-301-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Merge remote branch 'origin/4.7' into 4.7Olivier Goffart2010-03-253-21/+23
| |\ \ \ | | |/ /
| * | | Fix warnings and build on mingwThierry Bastian2010-03-251-1/+1
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Martin Jones2010-03-253-21/+23
|\ \ \ \ | | |/ / | |/| |
| * | | Merge remote branch 'main/4.7' into 4.7Morten Johan Sørvig2010-03-252-9/+9
| |\ \ \ | | |/ /
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-243-21/+23
| |\ \ \
| | * | | Compile Qt in C++0x mode.Thiago Macieira2010-03-201-17/+17
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-182-4/+6
| | |\ \ \
| | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-182-4/+6
| | | |\ \ \
| | | | * | | Rename QTimestamp to QElapsedTimerThiago Macieira2010-03-172-6/+6
| | | | * | | Port QtMultimedia uses of QTime as a stopwatch to QTimestamp (unix code only)Thiago Macieira2010-03-172-4/+6
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-252-3/+4
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.7Alexis Menard2010-03-252-3/+4
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | / | | | |_|_|/ | | |/| | |
| | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-03-241-2/+2
| | |\ \ \ \
| | | * | | | Calculate period size correctly.Justin McPherson2010-03-241-2/+2
| | * | | | | Symbian QAudioOutput::suspend() was resetting processedUSecs() to zeroGareth Stockwell2010-03-241-1/+2
| | |/ / / /
* | | | | | Rename loopCount to loops, in line with other declarative elements.Justin McPherson2010-03-252-9/+9
|/ / / / /