summaryrefslogtreecommitdiffstats
path: root/src/multimedia
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-02-2410-3/+72
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-02-2310-3/+72
| |\
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-02-2310-3/+72
| | |\
| | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-stagingNicholas Young2010-02-2315-20/+208
| | | |\
| | | | * Change qml.{h,cpp} -> multimediaqml.{h,cpp} in QtMultimedia.Justin McPherson2010-02-233-3/+3
| | | | * Add private header warning.Justin McPherson2010-02-235-0/+54
| | | * | Added QNetworkRequest constructor to QMediaContent.Nicholas Young2010-02-232-0/+15
* | | | | compile fix with namespaces after a broken automatical mergehjk2010-02-241-2/+0
|/ / / /
* | | | Merge remote branch 'origin/master'Thiago Macieira2010-02-235-2/+13
|\ \ \ \ | |/ / /
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-225-4/+15
| |\ \ \ | | |_|/ | |/| |
| | * | Fix compilation with namespace.ck2010-02-225-4/+15
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-2210-25/+27
|\ \ \ \ | |/ / / |/| | |
| * | | Cocoa: fix namespace buildRichard Moe Gustavsen2010-02-222-3/+3
| * | | doc: Fixed some qdoc errors.Martin Smith2010-02-223-7/+7
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-226-20/+22
| |\ \ \ | | |/ / | |/| |
| | * | Fix compilation on HP-UXi: m_volume is a #defineThiago Macieira2010-02-206-20/+20
| | * | Fix compilation on recent Linux systems: getpid(2) is in unistd.h.Thiago Macieira2010-02-201-0/+2
| | |/
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-02-2211-19/+153
|\ \ \ | |/ / |/| |
| * | Documentation fixes.Justin McPherson2010-02-225-16/+20
| * | Add a qRegisterQmlElements function to QtMultimediaJustin McPherson2010-02-226-3/+133
| |/
* | QtMultimedia: Fix compilation of qml/qsoundeffect_pulse on 64 bit.Daniel Molkentin2010-02-211-1/+1
|/
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-193-6/+6
|\
| * optimization: get rid of QString::fromUtf16() usage, part 2Oswald Buddenhagen2010-02-163-6/+6
* | Complete namespace move; QtMedia -> QtMultimediaJustin McPherson2010-02-194-76/+76
* | Use the qmlmodule method for adding multimedia qml elements.Justin McPherson2010-02-196-7/+3
* | Change namespace; QtMedia -> QtMultimediaJustin McPherson2010-02-1910-102/+102
* | Switch RGB24 and BGR24 shaders back.Andrew den Exter2010-02-181-4/+4
* | Make QMediaPlaylist test pass.Andrew den Exter2010-02-171-1/+0
* | Fix QMediaPlayer test failure.Andrew den Exter2010-02-175-12/+11
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-teamJustin McPherson2010-02-171-2/+74
|\ \
| * | Support YUV444 formats in QPainterVideoSurface.Andrew den Exter2010-02-171-2/+74
* | | Fix license headers.Justin McPherson2010-02-172-4/+4
|/ /
* | Don't paint RGB24 frames as BGR24.Andrew den Exter2010-02-161-0/+26
* | Fixed compile error in pulseaudio soundeffect implementationKurt Korbatits2010-02-162-3/+3
* | Exclude OpenGL from QGraphicsVideoItem if Qt doesn't include QtOpenGL.Andrew den Exter2010-02-161-0/+5
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-multimediaJustin McPherson2010-02-152-15/+17
|\ \
| * | Fix flickering when items are overlaid on QGraphicsVideoItem.Andrew den Exter2010-02-152-5/+7
| * | Extend hue rotation to a full 360 degrees.Andrew den Exter2010-02-151-1/+1
| * | Fix hue rotation in QPainterVideoSurface.Andrew den Exter2010-02-151-9/+9
* | | Add missing QT_MODULE to header.Justin McPherson2010-02-151-0/+2
* | | Cleanup include files.Justin McPherson2010-02-155-17/+50
* | | Use correct license headers.Justin McPherson2010-02-1510-20/+20
* | | Use correct path for private header.Justin McPherson2010-02-151-1/+1
* | | Use correct path for headers and source in qml.pri.Justin McPherson2010-02-151-6/+6
* | | Merge branch 'master' of ../../qt/masterJustin McPherson2010-02-146-4/+12
|\ \ \ | |/ / |/| / | |/
| * Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-134-4/+0
| |\
| | * Doc: remove \preliminary tag from public multimedia classesVolker Hilsheimer2010-02-124-4/+0
| * | Doc: more \since 4.7Volker Hilsheimer2010-02-051-0/+4
| * | Doc: add \since 4.7 to new functions.Volker Hilsheimer2010-02-051-0/+8
* | | Add virtual destructors to QMediaObjectPrivate and QMediaServicePrivate.Andrew den Exter2010-02-113-2/+2