summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-teamJustin McPherson2010-02-173-3/+78
|\
| * Make QMediaPlayer test compile.Andrew den Exter2010-02-171-0/+2
| * Support YUV444 formats in QPainterVideoSurface.Andrew den Exter2010-02-172-3/+76
* | Remove tests not relevant to playback functionality.Justin McPherson2010-02-171-52/+2
* | Remove tests that depend on playlist plugins.Justin McPherson2010-02-171-28/+0
* | Add qmlaudio test to auto.proJustin McPherson2010-02-171-0/+1
* | Fix license headers.Justin McPherson2010-02-1713-26/+26
* | Remove unused files.Justin McPherson2010-02-176-419/+0
|/
* Extend the mappings between Direct Show and QVideoFrame color formats.Andrew den Exter2010-02-161-4/+31
* Don't paint RGB24 frames as BGR24.Andrew den Exter2010-02-162-1/+30
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-teamNicholas Young2010-02-164-3/+12
|\
| * Added multimedia to qmlviewerKurt Korbatits2010-02-161-0/+4
| * 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
* | Always pass encoded URLs to GStreamer. Fixes issue with spaces inNicholas Young2010-02-161-1/+1
|/
* 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
* | Revert "Added Q_WS_MAEMO_5 to mkspec file."Justin McPherson2010-02-151-2/+0
* | Express dependencies for QtMultimedia.Justin McPherson2010-02-151-2/+3
* | 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-143249-21512/+335535
|\ \ | |/ |/|
| * Merge branch 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-02-13383-4201/+2598
| |\
| | * Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-132676-3479/+321418
| | |\ | | |/ | |/|
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-1342-2829/+1122
| |\ \
| | * | Refactor font and zoom handling, reduces clutter in central widget.kh12010-02-1210-167/+212
| | * | Some more refactoring.kh12010-02-1212-358/+462
| | * | Move the QWebView based help viewer into it's own source files.kh12010-02-129-434/+560
| | * | add QMAKE_DEL_TREE (aka. rm -rf) to avoid more hard-coded platform ifdefsOswald Buddenhagen2010-02-122-5/+3
| | * | use variables from the spec instead of hard-coding platform ifdefsOswald Buddenhagen2010-02-121-7/+4
| | * | move $(DEL_FILE) 2> NUL redirection into .conf fileOswald Buddenhagen2010-02-122-15/+3
| | * | fix host platform conditionalOswald Buddenhagen2010-02-121-1/+1
| | * | purge msvc.net and msvc2002 makespecs. unsupported for a while now.Oswald Buddenhagen2010-02-124-359/+0
| | * | purge msvc6 suppport from qmake. qt doesn't support it for quite a while now.Oswald Buddenhagen2010-02-1213-1585/+7
| | * | remove weird -tp ce matching line nobody can say anything aboutOswald Buddenhagen2010-02-121-1/+1
| | * | remove remainder of mac9 modeOswald Buddenhagen2010-02-125-24/+6
| | * | remove the most blatant tmake compat pathsOswald Buddenhagen2010-02-123-12/+2
| | * | simplifyOswald Buddenhagen2010-02-121-1/+1
| | * | add qt5 todoOswald Buddenhagen2010-02-121-1/+1
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-131-2/+7
| |\ \ \
| | * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-121-2/+7
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlAlan Alpert2010-02-125-13/+31
| | | |\ \
| | | * | | Fix scrolling backwards when pathItemCount != model.countAlan Alpert2010-02-121-2/+7
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-...Qt Continuous Integration System2010-02-131-2/+12
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Enabled searching of IM plugins on Symbian.axis2010-02-121-2/+12