summaryrefslogtreecommitdiffstats
path: root/src/plugins
Commit message (Expand)AuthorAgeFilesLines
* 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
| | * | Fixed compile errors with gstreamer pluginKurt Korbatits2010-04-153-3/+3
| | * | Create Mediaservices lib, separate from Multimedia.Justin McPherson2010-04-1540-191/+191
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-142-24/+76
| | |\ \
| | | * | Gstreamer media backend: seek to media start on end of stream.Dmytro Poplavskiy2010-04-142-24/+76
* | | | | Optimization: Avoid data copy when reading jpegs from memoryaavit2010-04-231-3/+10
| |_|_|/ |/| | |
* | | | fix memory bugLorn Potter2010-04-211-3/+1
* | | | Remove redundant network configuration updates on startup.Aaron McCarthy2010-04-2012-16/+33
* | | | make sure to lock theseLorn Potter2010-04-191-0/+6
* | | | move network scan to thread.Lorn Potter2010-04-192-320/+388
|/ / /
* | | Compile (with -no-pch)Morten Johan Sørvig2010-04-151-1/+1
* | | Add missing QT_NO_BEARERMANAGEMENT ifdefs.Aaron McCarthy2010-04-1516-3/+61
* | | Introduce a qconfig feature for Bearer ManagementTasuku Suzuki2010-04-156-0/+23
* | | Remove holes in bearer management data structures.Aaron McCarthy2010-04-153-12/+12
* | | Don't link bearer plugins against QtGui unnecessarily.Aaron McCarthy2010-04-145-5/+5
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-04-1416-926/+1276
|\ \ \ | |/ / |/| |
| * | Compile on Mac OS 10.4Kent Hansen2010-04-146-3/+12
| * | Bearer management changes from Qt Mobility (7a5ff985)Aaron McCarthy2010-04-1410-923/+1264
| |/
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-04-132-3/+10
|\ \ | |/ |/|
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-04-122-3/+10
| |\
| | * Get stride from LinuxFB instead of calculating it ourselves.Paul Olav Tvete2010-04-081-1/+1
| | * Revert "Remove references to evr based renderer from .pro."Thierry Bastian2010-04-071-4/+9
| | * Revert "Update Phonon ds9 backend to 4.4.0."Thierry Bastian2010-04-071-0/+2
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-04-1310-2/+36
|\ \ \ | |/ / |/| |
| * | Introduce a qconfig feature for QtDBusTasuku Suzuki2010-04-089-0/+33
| * | Allow building Qt without the QtGui moduleBernhard Rosenkraenzer2010-04-071-2/+3
| |/
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-04-121-1/+2
|\ \ | |/ |/|
| * Fix problem with accessibility clients not getting info from QFileDialogAndy Shaw2010-04-111-1/+2
* | Merge remote branch 'origin/4.7' into 4.7Olivier Goffart2010-04-012-0/+8
|\ \
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-302-0/+8
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-302-0/+8
| | |\ \
| | | * | MONILITY-645Wolfgang Beck2010-03-302-0/+8
| * | | | Merge remote branch 'origin/4.7' into qt-4.7-from-4.6Thiago Macieira2010-03-3018-100/+299
| |\ \ \ \ | | |/ / /
| * | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-291-15/+10
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/|
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7aavit2010-03-3119-115/+309
|\ \ \ \
| * \ \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-03-30169-758/+32267
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Merge remote branch 'origin/4.7' into 4.7Olivier Goffart2010-03-3018-100/+299
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Don't fill the video widget borders or background by default.Andrew den Exter2010-03-301-0/+1