summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into qt-4.7-from-4.6Thiago Macieira2010-03-30122-2071/+4391
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-03-30122-2071/+4391
| |\
| | * Fix typo in phonon/symbian.Justin McPherson2010-03-301-1/+1
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-03-30122-2071/+4391
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7Dmytro Poplavskiy2010-03-302-7/+28
| | | |\
| | | | * Remove debug code disabling the video widget output control.Andrew den Exter2010-03-301-1/+0
| | | | * Force a repaint on changes in the native size of video frames.Andrew den Exter2010-03-301-0/+2
| | | | * Don't fill the video widget borders or background by default.Andrew den Exter2010-03-302-7/+27
| | | * | Fixed compilation on 64 bits Mac OS 10.5Dmytro Poplavskiy2010-03-301-1/+1
| | | |/
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7Andrew den Exter2010-03-292-2/+4
| | | |\
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7Dmytro Poplavskiy2010-03-294-3/+13
| | | | |\
| | | | | * Update PulseAudio config.test.Justin McPherson2010-03-291-1/+2
| | | | * | QuickTime video widget: use widget palette for video background color.Dmytro Poplavskiy2010-03-291-1/+2
| | | * | | Fix compile.Andrew den Exter2010-03-291-0/+2
| | | | |/ | | | |/|
| | | * | Fix strange typo? in Phonon/ds9.pro.Justin McPherson2010-03-291-1/+1
| | | * | Change availabilty of camera related code.Justin McPherson2010-03-292-1/+10
| | | |/
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7Dmytro Poplavskiy2010-03-29102-1962/+3673
| | | |\
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-03-2999-1959/+3665
| | | | |\
| | | | | * Merge branch 'phonon-update' into 4.7Justin McPherson2010-03-2999-1959/+3665
| | | | | |\
| | | | | | * Remove references to evr based renderer from .pro.Justin McPherson2010-03-291-10/+1
| | | | | | * Phonon core; compile fixes after merge.Justin McPherson2010-03-262-2/+1
| | | | | | * Phonon qt7; Compile fixes after merge.Justin McPherson2010-03-265-12/+21
| | | | | | * Phonon; complete integration.Justin McPherson2010-03-2512-22/+1678
| | | | | | * Update Phonon CMakeLists.txt.Justin McPherson2010-03-251-1/+1
| | | | | | * Update Phonon qt7 backend to 4.4.0.Justin McPherson2010-03-2510-574/+137
| | | | | | * Update Phonon ds9 backend to 4.4.0.Justin McPherson2010-03-2533-996/+621
| | | | | | * Update Phonon GStreamer backend to 4.4.0.Justin McPherson2010-03-2520-142/+651
| | | | | | * Update Phonon core to 4.4.0Justin McPherson2010-03-2523-217/+571
| | | * | | | QuickTime media backend: ensure quicktime notification areDmytro Poplavskiy2010-03-291-4/+4
| | | * | | | QuickTime backend: disable video outputs in stopped state.Dmytro Poplavskiy2010-03-2910-33/+19
| | | * | | | QuickTime media backend: Render CIImage based video frames directly withDmytro Poplavskiy2010-03-2911-66/+660
| | | | |/ / | | | |/| |
* | | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-03-3019-121/+298
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Merge remote branch 'origin/4.7' into qt-4.7-from-4.6Thiago Macieira2010-03-3077-1186/+2840
| |\ \ \ \ \ | | |/ / / /
| * | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-2968-358/+1320
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-03-262-16/+36
| | |\ \ \ \
| | | * \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-03-262-16/+36
| | | |\ \ \ \
| | | | * \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-03-262-16/+36
| | | | |\ \ \ \
| | | | | * | | | Fix compile error on Symbian 9.1, caused in network/access.Frans Englich2010-03-262-14/+33
| | | | | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-03-262-2/+3
| | | | | |\ \ \ \
| | | | | | * \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-03-262-2/+3
| | | | | | |\ \ \ \
| | | | | | | * \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-03-252-2/+3
| | | | | | | |\ \ \ \
| | | | | | | | * | | | QNAM HTTP: Symbian compile fixMarkus Goetz2010-03-251-0/+1
| | | | | | | | * | | | QNAM HTTP: Fix crazy crash when exiting applicationMarkus Goetz2010-03-252-2/+2
| | * | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-03-261-15/+10
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | | * | | | | | | | | Refactor QDirectFBPixmap::fromImage slightlyAnders Bakken2010-03-261-14/+9
| | | * | | | | | | | | QDirectFBPixmap can handle NoOpaqueDetection.Anders Bakken2010-03-261-1/+1
| | * | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-03-262-2/+47
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | | * | | | | | | | | QInputContextFactory::languages implementation for Symbian.Janne Anttila2010-03-262-2/+47
| | | |/ / / / / / / /
| | * | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-03-262-13/+10
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | | * | | | | | | | Reverts using composition mode when using DeviceCoordinateMode cache.Yoann Lopes2010-03-261-7/+6