summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into 4.7Olivier Goffart2010-03-30184-2938/+5576
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-03-30126-2089/+4438
| |\
| | * 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-30126-2089/+4438
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7Dmytro Poplavskiy2010-03-303-7/+34
| | | |\
| | | | * 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-303-7/+33
| | | * | 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-295-20/+45
| | | |\
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7Dmytro Poplavskiy2010-03-297-21/+54
| | | | |\
| | | | | * Update PulseAudio config.test.Justin McPherson2010-03-294-19/+43
| | | | * | 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-29104-1964/+3675
| | | |\
| | | | * 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 '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-3058-849/+1139
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Correctly construct boolean JSValue'sAaron Kennedy2010-03-303-3/+47
| | * | | | Update QmlChanges for SmoothedAnimationLeonardo Sobral Cunha2010-03-301-0/+33
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-3050-816/+1036
| | |\ \ \ \
| | | * | | | WorkerScript was receiving events after deletion and trying to processBea Lam2010-03-302-8/+9
| | | * | | | Make visual tests run on windowsMartin Jones2010-03-301-1/+2
| | | * | | | Fixes PathView compile warningsLeonardo Sobral Cunha2010-03-302-2/+2
| | | * | | | Finished file rename of qdeclarative easefollow to smoothedanimationLeonardo Sobral Cunha2010-03-3025-33/+32
| | | * | | | Change and rename qml EaseFollow to SmoothedAnimationLeonardo Sobral Cunha2010-03-3025-386/+609
| | | * | | | Fix parenting after 6f88388db4e8e202780d789e66664ff824691948.Michael Brasser2010-03-308-35/+31
| | * | | | | Make qmlpixmapcache thread shutdown cleanerMartin Jones2010-03-301-12/+6
| | |/ / / /
| | * | | | Fix viewer resizing on reload and File->openMartin Jones2010-03-302-17/+17
| | * | | | Don't emit onPositionChanged before onPressedMartin Jones2010-03-301-1/+0
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-03-306-5/+16
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-03-307-9/+91
| |\ \ \ \ \ \
| | * | | | | | Hack .pro files on windows to define QT_NO_EGLTom Cooksey2010-03-304-0/+6
| * | | | | | | Support the pen set on the painter in QStaticText when using rich textEskil Abrahamsen Blomfeldt2010-03-301-0/+5
| * | | | | | | Fix setting font for QStaticText on Linux and MacEskil Abrahamsen Blomfeldt2010-03-301-5/+5
* | | | | | | | Fix QStaticText test on MacEskil Abrahamsen Blomfeldt2010-03-301-5/+5
| |/ / / / / / |/| | | | | |