summaryrefslogtreecommitdiffstats
path: root/src/plugins
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlWarwick Allison2010-02-245-10/+6
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtMartin Jones2010-02-245-10/+6
| |\
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-225-10/+6
| | |\
| | | * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1Martin Smith2010-02-225-10/+6
| | | |\
| | | | * Cocoa: fix namespace buildRichard Moe Gustavsen2010-02-225-10/+6
| | | * | qdoc: List new QML elements in \sincelist for What's New page.Martin Smith2010-02-221-1/+1
| | | |/
| | | * doc: Fixed some qdoc errors.Martin Smith2010-02-221-1/+1
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlWarwick Allison2010-02-232-17/+11
|\ \ \ \ | |/ / /
| * | | Get rid of QmlModulePlugin.Roberto Raggi2010-02-231-12/+4
| |/ /
* | | Remove QML_DEFINE_... macros, now use QML_REGISTER_... macros calls.Warwick Allison2010-02-237-0/+755
|/ /
* | Documentation fixes.Justin McPherson2010-02-222-2/+2
* | Add a qRegisterQmlElements function to QtMultimediaJustin McPherson2010-02-221-6/+2
|/
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-202-6/+8
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2aavit2010-02-202-0/+8
| |\
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-202-5/+10
| | |\
| * | | Compile fix for symbianaavit2010-02-201-5/+2
| | |/ | |/|
| * | Merge branch 'rjpeg8'aavit2010-02-202-5/+10
| |\ \
| | * | Update license doc, .pro file and qjpeghandler for libjpeg 8aavit2010-02-162-5/+10
* | | | Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-20109-4/+18670
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-192-0/+8
| |\ \ \ | | |/ / | |/| |
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtMartin Jones2010-02-181-7/+4
| | |\ \
| | * | | MOBILITY-404 QS Windows.Wolfgang Beck2010-02-162-0/+8
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-193-3/+18
| |\ \ \ \
| | * \ \ \ Merge remote branch 'qt/master' into staging-2-masterQt Continuous Integration System2010-02-181-7/+4
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | * | | | Reduced the memory footprint of qttrace files.Samuel Rødal2010-02-181-2/+7
| | | |_|/ | | |/| |
| | * | | Merge remote branch 'qt/master' into staging-2-masterQt Continuous Integration System2010-02-151-0/+11
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Merge branch 'master' of scm.dev.troll.no:qt/oslo-staging-2 into qstatictext-4.7Eskil Abrahamsen Blomfeldt2010-02-155-513/+79
| | |\ \ \
| | * \ \ \ Merge branch '4.6' into qstatictext-4.6Eskil Abrahamsen Blomfeldt2010-02-083-36/+85
| | |\ \ \ \
| | * \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into qstat...Eskil Abrahamsen Blomfeldt2010-02-045-2/+263
| | |\ \ \ \ \
| | * | | | | | Lock before calling drawStaticTextItemAnders Bakken2010-02-022-1/+11
| * | | | | | | QT5; Add back volume notification.Justin McPherson2010-02-191-11/+20
| * | | | | | | Use old notification name for OSX < 10.6.Justin McPherson2010-02-191-7/+9
| * | | | | | | QT7; make compile on 10.5.Justin McPherson2010-02-191-1/+2
| * | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-teamJustin McPherson2010-02-1911-59/+197
| |\ \ \ \ \ \ \
| | * | | | | | | QuickTime playback backend: listen for natural size changes and updateDmytro Poplavskiy2010-02-1911-15/+58
| | * | | | | | | Quicktime playback backend: Recreate the visual context on video nativeDmytro Poplavskiy2010-02-191-30/+42
| | * | | | | | | QuickTime playback backend: Listen for movie load state changes.Dmytro Poplavskiy2010-02-192-28/+111
| * | | | | | | | Lowercase Q to uppercase in QML elment URI.Justin McPherson2010-02-191-5/+5
| * | | | | | | | Complete namespace move; QtMedia -> QtMultimediaJustin McPherson2010-02-193-41/+41
| * | | | | | | | Use the qmlmodule method for adding multimedia qml elements.Justin McPherson2010-02-194-0/+92
| * | | | | | | | Change namespace; QtMedia -> QtMultimediaJustin McPherson2010-02-197-95/+95
| |/ / / / / / /
| * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into ma...Qt Continuous Integration System2010-02-18101-1/+18402
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | Switch RGB24 and BGR24 shaders back.Andrew den Exter2010-02-182-3/+3
| | * | | | | | Use the IPropertyBag interface to get audio device names.Andrew den Exter2010-02-181-1/+15
| | * | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-teamJustin McPherson2010-02-171-1/+2
| | |\ \ \ \ \ \
| | | * | | | | | Support YUV444 formats in QPainterVideoSurface.Andrew den Exter2010-02-171-1/+2
| | * | | | | | | 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-161-1/+4
| | * | | | | | Always pass encoded URLs to GStreamer. Fixes issue with spaces inNicholas Young2010-02-161-1/+1