summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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-265-5/+10
|\ \ \ | |/ / |/| |
| * | Qualify ptrdiff_t's namespace in stltest configure testJoão Abecasis2010-03-261-1/+1
| * | 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
| * | Designer: Fix broken resource view filtering.Friedemann Kleint2010-03-261-1/+1
* | | 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
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-263-7/+29
|\ \ \ \ | | |/ / | |/| |
| * | | specify the configuration's purpose based on security mode of network.Lorn Potter2010-03-263-7/+29
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-25284-13972/+13784
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | Use QTRY_COMPARE after QTest::qWaitForWindowShown()Kent Hansen2010-03-251-1/+1
| * | Use the new memory cost reporting API in QtScript Custom Class exampleKent Hansen2010-03-253-2/+30
| * | QtScript: Add API for reporting additional memory costsKent Hansen2010-03-255-3/+81
| * | 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-25226-3447/+2531
| |\ \
| | * \ Merge remote branch 'main/4.7' into 4.7Morten Johan Sørvig2010-03-25226-3447/+2531
| | |\ \ | |_|/ / |/| | |
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-03-253-13/+13
|\ \ \ \ | | |_|/ | |/| |
| * | | Rename loopCount to loops, in line with other declarative elements.Justin McPherson2010-03-253-13/+13
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-25223-3435/+2519
|\ \ \ \ | |/ / / |/| | |
| * | | Qt.Infinite -> Animation.InfiniteMichael Brasser2010-03-2540-55/+91
| * | | Doc fix.Michael Brasser2010-03-253-3/+3
| * | | Skip tests for nowBea Lam2010-03-251-0/+4
| * | | Make autotest work on windows.Martin Jones2010-03-251-2/+5
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-03-2540-81/+124
| |\ \ \
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-2537-77/+93
| | |\ \ \
| | | * | | Replace Animation's repeat property with loops.Michael Brasser2010-03-2537-77/+93
| | * | | | 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-240-0/+0
| | |\ \ \ \ | | | |/ / /
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-2414-37/+53
| | |\ \ \ \
| | * | | | | Compile with qtnamespaceMartin Jones2010-03-241-1/+2
| * | | | | | Remove faulty assert - the precondition is checked for correctly later onAaron Kennedy2010-03-254-3/+12
| | |_|/ / / | |/| | | |
| * | | | | Fix compile in namespace.Michael Brasser2010-03-241-2/+2
| | |/ / / | |/| | |
| * | | | Merge remote branch 'origin/4.7' into HEADThiago Macieira2010-03-2412-37/+42
| |\ \ \ \ | |/ / / / |/| | | |
| * | | | Disallow the implicit QDeclarativeGuardedContextData copy constructorAaron Kennedy2010-03-241-0/+10
| * | | | DocAaron Kennedy2010-03-241-0/+1
| |/ / /
| * | | Merge branch '4.7' of ../qt-4.7 into 4.7Martin Jones2010-03-244-4/+33
| |\ \ \