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-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
| |\ \ | |/ / |/| |
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-03-241-0/+0
|\ \ \
| * | | Help qt-qml integrate.Alan Alpert2010-03-241-0/+0
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-2413-38/+43
|\ \ \ \ | |/ / / |/| | |
| * | | Inverted sorting arrows on QHeaderViews is intentional on GNOMEGabriel de Dietrich2010-03-241-0/+2
| * | | Fix compilation for winCEThierry Bastian2010-03-241-1/+2
| * | | Revert "Sort indicators displayed incorrectly in GTK style"Gabriel de Dietrich2010-03-241-2/+2
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-2313-41/+43
| |\ \ \
| | * | | Fix warnings in the declarative moduleThierry Bastian2010-03-233-3/+3
| | * | | compile fix for mingw (also removes some warnings)Thierry Bastian2010-03-239-36/+38
| | * | | Sort indicators displayed incorrectly in GTK styleGabriel de Dietrich2010-03-231-2/+2
| | | * | 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
| | | |\ | |_|_|/ |/| | |
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-03-244-4/+33
|\ \ \ \ | |/ / / |/| | |
| * | | Added extra video buffer handle types.Dmytro Poplavskiy2010-03-242-0/+4
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7Dmytro Poplavskiy2010-03-221182-20115/+40407
| |\ \ \
| * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7Dmytro Poplavskiy2010-03-161-1/+1
| |\ \ \ \
| * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7Dmytro Poplavskiy2010-03-15177-3724/+5250
| |\ \ \ \ \
| * | | | | | QuickTime MovieViewOutput: remove view from layout and reset sourceDmytro Poplavskiy2010-03-112-4/+29
| | | | | | * 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-244-4/+5
| | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-2435-599/+744
| | | | | | |\
| | | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-03-2415-341/+92
| | | | | | | |\
| | | | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-2413-94/+254
| | | | | | | | |\
| | | | | | | | * | Document QML security considerations.Warwick Allison2010-03-242-0/+91
| | | | | | | | * | Remove support for QML-in-HTML-in-WebViewWarwick Allison2010-03-245-207/+0
| | | | | | | | * | Revert 95aa8c8fc76e2309a629b05994a2677b0887140b.Warwick Allison2010-03-248-134/+1
| | | | | | | * | | DocAaron Kennedy2010-03-241-246/+206
| | | | | | | | |/ | | | | | | | |/|
| | | | | | | * | Fix abort in flipableLeonardo Sobral Cunha2010-03-242-3/+14
| | | | | | | * | Add object ids to the metadata provided in debugger classes.Bea Lam2010-03-248-8/+52