summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-03-253-13/+13
|\ | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Rename loopCount to loops, in line with other declarative elements.
| * Rename loopCount to loops, in line with other declarative elements.Justin McPherson2010-03-253-13/+13
| | | | | | | | Reviewed-by: Dmytro Poplavskiy
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-25223-3435/+2519
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (76 commits) Qt.Infinite -> Animation.Infinite Doc fix. Skip tests for now Make autotest work on windows. Remove faulty assert - the precondition is checked for correctly later on Ensure currentIndex is updated when items inserted before currentIndex Replace Animation's repeat property with loops. Fix compile in namespace. Compile with qtnamespace Disallow the implicit QDeclarativeGuardedContextData copy constructor Doc Fix leak. StateChangeScript doc. A StateChangeScript should never be run when leaving the state. ScriptAction doc. Rename stateChangeScriptName to scriptName. Doc Document QML security considerations. Fix flicking views at boundary with StricthighlighRange Fix abort in flipable ...
| * Qt.Infinite -> Animation.InfiniteMichael Brasser2010-03-2540-55/+91
| | | | | | | | | | Too misleading to have on the Qt object, as it only means infinite for animation loops.
| * 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
| | | | | | | | | | | | | | | | | | | | You can now loop a fixed number of times as well as forever. The old repeat behavior (loop forever) can be acheived with loops: Qt.Infinite.
| | * | Ensure currentIndex is updated when items inserted before currentIndexMartin Jones2010-03-252-4/+30
| | | | | | | | | | | | | | | | | | | | | | | | Was occurring when items inserted but no items had been created yet. Task-number: QTBUG-9313
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-240-0/+0
| | |\ \ | | | |/ | | | | | | | | | | | | Conflicts: src/declarative/util/qdeclarativexmllistmodel.cpp
| | * | 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
| | |_|/ | |/| | | | | | | | | | Task-number: QTBUG-9336
| * | | Fix compile in namespace.Michael Brasser2010-03-241-2/+2
| | |/ | |/|
| * | Merge remote branch 'origin/4.7' into HEADThiago Macieira2010-03-2412-37/+42
| |\ \ | |/ / |/| | | | | | | | Conflicts: src/declarative/qml/qdeclarativecompiler.cpp
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-03-241-0/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Help qt-qml integrate.
| * | | Help qt-qml integrate.Alan Alpert2010-03-241-0/+0
| | | | | | | | | | | | | | | | | | | | Git seems to be having trouble with the merge, this might make it easier.
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-2413-38/+43
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Inverted sorting arrows on QHeaderViews is intentional on GNOME Fix compilation for winCE Revert "Sort indicators displayed incorrectly in GTK style" Fix warnings in the declarative module compile fix for mingw (also removes some warnings) Sort indicators displayed incorrectly in GTK style
| * | | Inverted sorting arrows on QHeaderViews is intentional on GNOMEGabriel de Dietrich2010-03-241-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It follows the GNOME HIG as specified in http://library.gnome.org/devel/hig-book/stable/controls-lists.html.en Ammending commit reversion fad919fa0fe976facc94685fd1460b4961b72c4e. Reviewed-by: jbache Task-number: QTBUG-9299
| * | | Fix compilation for winCEThierry Bastian2010-03-241-1/+2
| | | |
| * | | Revert "Sort indicators displayed incorrectly in GTK style"Gabriel de Dietrich2010-03-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 74ce3dea8b3ea06d61cef4e729f6a95f670461fe. The sorting order is intentional.
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-2313-41/+43
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix warnings in the declarative module compile fix for mingw (also removes some warnings) Sort indicators displayed incorrectly in GTK style
| | * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Thierry Task-number: QTBUG-9299
| | | * | Disallow the implicit QDeclarativeGuardedContextData copy constructorAaron Kennedy2010-03-241-0/+10
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9312
| | | * | DocAaron Kennedy2010-03-241-0/+1
| | | |/
| | | * Merge branch '4.7' of ../qt-4.7 into 4.7Martin Jones2010-03-244-4/+33
| | | |\ | |_|_|/ |/| | | | | | | | | | | Conflicts: tests/auto/declarative/qdeclarativedom/data/importlib/sublib/qmldir
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-03-244-4/+33
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Added extra video buffer handle types. QuickTime MovieViewOutput: remove view from layout and reset source
| * | | Added extra video buffer handle types.Dmytro Poplavskiy2010-03-242-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | XvShmImageHandle for XVideo shared memory image on X11 and and CoreImageHandle for CIImage on Mac OS X. Reviewed-by: Justin McPherson
| * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | movie when MovieViewOutput output is disabled. Reviewed-by: Justin McPherson
| | | | | | * 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For a Transition running in reverse, stop ScriptAction from running any StateSchageScripts.
| | | | | | * 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, this feature too prone to accidental misuse and abuse.
| | | | | | | | * | Revert 95aa8c8fc76e2309a629b05994a2677b0887140b.Warwick Allison2010-03-248-134/+1
| | | | | | | | | |
| | | | | | | * | | DocAaron Kennedy2010-03-241-246/+206
| | | | | | | | |/ | | | | | | | |/|
| | | | | | | * | Fix abort in flipableLeonardo Sobral Cunha2010-03-242-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Flipable was calling updateSceneTransformFromParent, but this can only called when the the parent's scene transform is guaranteed to be updated, which is not the case in flipable. Task-number: QTBUG-8474 Reviewed-by: bnilsen
| | | | | | | * | Add object ids to the metadata provided in debugger classes.Bea Lam2010-03-248-8/+52
| | | | | | | | |
generated by cgit v0.12 at 2024-11-16 00:54:01 (GMT)