summaryrefslogtreecommitdiffstats
path: root/src/plugins
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-05-272-16/+11
|\
| * Fix a bug in QDirectFBPixmapData::fromImageAnders Bakken2010-05-272-16/+11
* | Fix build when snap functionality is not available.Aaron McCarthy2010-05-251-2/+2
* | remove dead code that will never get called.Lorn Potter2010-05-211-2/+0
* | add bytes and activeTime to corelwan.Lorn Potter2010-05-212-8/+102
* | Fix crash on exit in native wifi plugin on Vista+ when run in debugger.Aaron McCarthy2010-05-202-23/+73
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Andrew den Exter2010-05-187-268/+445
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-05-144-262/+431
| |\
| | * Merge remote branch 'staging/4.7' into bearermanagement/mobility-changes-squashAaron McCarthy2010-05-146-7/+12
| | |\
| | * | Cherry pick fix for MOBILITY-932 from Qt Mobility.Aaron McCarthy2010-05-141-18/+14
| | * | Cherry pick fix for MOBILITY-828 from Qt Mobility.Aaron McCarthy2010-05-141-2/+2
| | * | Cherry pick fix for MOBILITY-828 from Qt Mobility.Aaron McCarthy2010-05-144-243/+416
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-05-131-3/+7
| |\ \ \ | | |_|/ | |/| |
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-05-121-3/+7
| | |\ \
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-05-071-3/+7
| | | |\ \ | | | | |/ | | | |/|
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-05-071-3/+7
| | | | |\
| | | | | * Fixes regression: SVG image loading would fail from QBuffer with pos!=0aavit2010-05-051-3/+7
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-131-2/+5
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Stop GIF handler claiming it can report Size for sequential devices,Warwick Allison2010-05-121-2/+5
| | |/ / /
| * | | | fix webkit crash when accessing network on SymbianJanne Koskinen2010-05-111-1/+1
| * | | | Merge commit 'origin/4.7' into symbian47Thomas Zander2010-05-103-6/+21
| |\ \ \ \ | | |/ / /
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-05-064-4/+6
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Disable compiling of the plugin when extra package not foundThomas Zander2010-05-041-1/+3
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-05-043-3/+3
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Added missing UID3 for qsymbianbearer.dll.Espen Riskedal2010-05-031-0/+1
| | | * | Fix includes so it compilesThomas Zander2010-05-032-3/+2
* | | | | Removed mediaservices.Kurt Korbatits2010-05-18134-24527/+1
| |_|_|/ |/| | |
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-05-073-6/+21
|\ \ \ \ | |/ / / |/| | |
| * | | Fix build error for S60 3.1 winscw targetDerick Hawcroft2010-05-052-5/+20
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-05-041-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | Gstreamer mediaservice backend: fixed check for X11/QWS build.Dmytro Poplavskiy2010-05-041-1/+1
| | |/
* | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-05-041-1/+1
|\ \ \ | |/ / |/| |
| * | PowerVR screen driver using undefined symbolsRhys Weatherley2010-05-031-1/+1
* | | Fixed a QBuffer warning caused by a regression in qjpegJohn Brooks2010-05-031-3/+9
| |/ |/|
* | Fix crash in direct show media service with mingw and a video surface.Andrew den Exter2010-04-302-20/+8
* | Gstreamer media backend: fixed embedded qt buildDmytro Poplavskiy2010-04-295-21/+62
* | S60 mediaservices backendhawcroft2010-04-2932-0/+4976
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-04-271-0/+4
|\ \
| * | Fix the compilation with QT_NO_TOOLTIPTasuku Suzuki2010-04-271-0/+4
* | | Fix attempted invocation of non-existent timerActivated() slot.Andrew den Exter2010-04-271-2/+2
|/ /
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-04-261-3/+11
|\ \
| * | Enable QX11GLWindowSurface using "-graphicssystem x11gl" optionTom Cooksey2010-04-261-3/+11
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-2441-232/+289
|\ \ \ | |/ / |/| |
| * | Remove trace code from directshowaudioendpointcontrol.h.Andrew den Exter2010-04-231-5/+0
| * | Merge branch '4.7' of ../../qt/4.7 into 4.7Justin McPherson2010-04-2212-332/+421
| |\ \
| * | | Gstreamer media backend: preserve playback rate after seeks and mediaDmytro Poplavskiy2010-04-211-4/+15
| * | | QT7 mediaservice; fix leaking strings.Justin McPherson2010-04-201-8/+7
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-1941-215/+267
| |\ \ \
| | * | | Fix compile errors in Direct Show media service.Andrew den Exter2010-04-162-2/+2
| | * | | QtMediaservices -> QtMediaServices.Justin McPherson2010-04-1637-185/+185