summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* QuickTime video widget: use widget palette for video background color.Dmytro Poplavskiy2010-03-291-1/+2
* 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
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-263-3/+8
| |\ \ \ | | |/ / | |/| |
| | * | Fix the bug where the ampersand symbol would be discarded.Fabien Freling2010-03-262-3/+7
| | * | QtScript: Add missing API shim for signal handlingKent Hansen2010-03-261-0/+1
* | | | 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-multimedia-staging into 4....Qt Continuous Integration System2010-03-268-38/+95
|\ \ \ | |/ / |/| |
| * | Don't specify a BottomToTop scan line direction for YUV frames.Andrew den Exter2010-03-261-6/+22
| * | Support expanding aspect ratio in direct show video window control.Andrew den Exter2010-03-264-30/+43
| * | Support the Expanding aspect ratio mode in the gstreamer window control.Andrew den Exter2010-03-263-2/+30
* | | specify the configuration's purpose based on security mode of network.Lorn Potter2010-03-263-7/+29
* | | QtScript: Add API for reporting additional memory costsKent Hansen2010-03-254-3/+62
* | | Add experimental support for StaticContents in Mac OS X.Fabien Freling2010-03-251-1/+18
* | | Fix misspelling in function name.Fabien Freling2010-03-251-2/+2
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Lorn Potter2010-03-2579-1242/+1127
|\ \ \
| * \ \ Merge remote branch 'main/4.7' into 4.7Morten Johan Sørvig2010-03-2579-1242/+1127
| |\ \ \ | | |/ /
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-03-252-9/+9
| | |\ \ | | | |/
| | | * Rename loopCount to loops, in line with other declarative elements.Justin McPherson2010-03-252-9/+9
| | * | Qt.Infinite -> Animation.InfiniteMichael Brasser2010-03-257-12/+48
| | * | Doc fix.Michael Brasser2010-03-253-3/+3
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-03-2510-38/+81
| | |\ \
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-257-34/+50
| | | |\ \
| | | | * | Replace Animation's repeat property with loops.Michael Brasser2010-03-257-34/+50
| | | * | | Ensure currentIndex is updated when items inserted before currentIndexMartin Jones2010-03-252-4/+30
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-2410-23/+33
| | | |\ \ \
| | | * | | | Compile with qtnamespaceMartin Jones2010-03-241-1/+2
| | * | | | | Remove faulty assert - the precondition is checked for correctly later onAaron Kennedy2010-03-251-2/+1
| | | |_|/ / | | |/| | |
| | * | | | Fix compile in namespace.Michael Brasser2010-03-241-2/+2
| | | |/ / | | |/| |
| | * | | Merge remote branch 'origin/4.7' into HEADThiago Macieira2010-03-249-23/+23
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Disallow the implicit QDeclarativeGuardedContextData copy constructorAaron Kennedy2010-03-241-0/+10
| | | |/ | | |/|
| | * | Merge branch '4.7' of ../qt-4.7 into 4.7Martin Jones2010-03-244-4/+33
| | |\ \
| | * | | Fix leak.Michael Brasser2010-03-241-1/+2
| | * | | StateChangeScript doc.Michael Brasser2010-03-241-2/+24
| | * | | A StateChangeScript should never be run when leaving the state.Michael Brasser2010-03-242-5/+11
| | * | | ScriptAction doc.Michael Brasser2010-03-241-0/+31
| | * | | Rename stateChangeScriptName to scriptName.Michael Brasser2010-03-243-3/+4
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-2416-203/+185
| | |\ \ \