summaryrefslogtreecommitdiffstats
path: root/src/declarative
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'main/4.7' into 4.7Morten Johan Sørvig2010-03-2569-1139/+1101
|\ | | | | | | | | | | Conflicts: demos/declarative/minehunt/minehunt.cpp src/declarative/qml/qdeclarativecompiler.cpp
| * Qt.Infinite -> Animation.InfiniteMichael Brasser2010-03-257-12/+48
| | | | | | | | | | Too misleading to have on the Qt object, as it only means infinite for animation loops.
| * 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
| | | | | | | | | | | | | | | | | | | | 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-243-2/+12
| | |\ \
| | * | | Compile with qtnamespaceMartin Jones2010-03-241-1/+2
| | | | |
| * | | | Remove faulty assert - the precondition is checked for correctly later onAaron Kennedy2010-03-251-2/+1
| | |_|/ | |/| | | | | | | | | | Task-number: QTBUG-9336
| * | | Fix compile in namespace.Michael Brasser2010-03-241-2/+2
| | |/ | |/|
| * | Merge remote branch 'origin/4.7' into HEADThiago Macieira2010-03-242-2/+2
| |\ \ | | | | | | | | | | | | | | | | Conflicts: src/declarative/qml/qdeclarativecompiler.cpp
| * | | Disallow the implicit QDeclarativeGuardedContextData copy constructorAaron Kennedy2010-03-241-0/+10
| | |/ | |/| | | | | | | Task-number: QTBUG-9312
| * | 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-243-3/+4
| | |
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-2414-115/+185
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-2411-92/+175
| | |\ \
| | | * | Fix abort in flipableLeonardo Sobral Cunha2010-03-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | |
| | | * | Properly use one thread for all instances of XmlListModel.Bea Lam2010-03-242-83/+122
| | | | | | | | | | | | | | | | | | | | Task-number: QT-2831
| | * | | Revert 95aa8c8fc76e2309a629b05994a2677b0887140b.Warwick Allison2010-03-246-55/+0
| | |/ /
| | * | Make compile.Michael Brasser2010-03-241-1/+1
| | | |
| | * | Output all Loader errors.Michael Brasser2010-03-241-0/+2
| | | | | | | | | | | | | | | | | | | | Previously we were not outputting those that occurred on component->create().
| | * | Fix Loader leak when loading a non-QGraphicsObject object.Michael Brasser2010-03-241-1/+5
| | | |
| | * | Use setParent_NoEvent in Loader and benchmark Loader performance.Michael Brasser2010-03-241-2/+3
| | | |
| | * | Animation construction optimization.Michael Brasser2010-03-241-1/+1
| | | | | | | | | | | | | | | | Use setParent_NoEvent when parenting to group.
| | * | Origin safety testing for imported resources.Warwick Allison2010-03-245-13/+48
| | | | | | | | | | | | | | | | | | | | Extends upon 95aa8c8fc76e2309a629b05994a2677b0887140b. Still under discussion.
| * | | Fix flicking views at boundary with StricthighlighRangeMartin Jones2010-03-242-37/+49
| | | | | | | | | | | | | | | | Task-number: QTBUG-9256
| * | | Doc: ids start with lowercaseMartin Jones2010-03-241-9/+9
| |/ /
| * | Fix warning.Michael Brasser2010-03-231-1/+1
| | |
| * | Changing the alignment property should trigger a repaint.Alexis Menard2010-03-231-0/+1
| | | | | | | | | | | | | | | | | | | | | Just clear the cache when the property changes. Task-number:QTBUG-8155 Reviewed-by:Yann Bodson
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-239-272/+58
| |\ \
| | * | Change default RotationAnimation direction.Michael Brasser2010-03-232-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | Shortest as default too often led to unintuitive behavior. For example, RotationAnimation { from: 0; to: 360 } will not animate at all. Numerical gives the least surprising results.
| | * | Add missing NOTIFYs.Michael Brasser2010-03-234-7/+41
| | | | | | | | | | | | | | | | Task-number: QTBUG-8816
| | * | Remove ParentAction.Michael Brasser2010-03-236-256/+7
| | | | | | | | | | | | | | | | It has been replaced with ParentAnimation.
| | * | Fix mutex handling that was causing tests to sometimes crash/fail.Bea Lam2010-03-231-2/+2
| | | |
| * | | Basic Loader origin safety (for discussion).Warwick Allison2010-03-233-0/+21
| |/ /
| * | Manual merge.Warwick Allison2010-03-227-9/+81
| | |
| * | Test imports with realistic paths (previously passed accidentally).Warwick Allison2010-03-221-3/+10
| | | | | | | | | | | | Fix failure when import path is ancestor dir of other import path.
| * | Add Script removal to QmlChanges.txtMartin Jones2010-03-221-0/+38
| | |
| * | Use canonical form for headersKai Koehne2010-03-221-2/+2
| | | | | | | | | | | | | | | | | | Allows QmlDesigner to use qdeclarativestate_p_p.h Reviewed-by: Marco Bubke
| * | Remove exporting of QDeclarativeContext class symbolsKai Koehne2010-03-221-1/+1
| | | | | | | | | | | | We're not using it in QmlDesigner any more
| * | Remove non-existing header from pri fileKai Koehne2010-03-221-2/+1
| | | | | | | | | | | | Got added in 081fafe395d52.
| * | Fix Loader crash.Michael Brasser2010-03-221-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | If setting the source of a Loader triggered a change to the source (i.e. the thing being loaded set the source to something else) a crash would occur. We now no longer delete the component immediately when the source changes. Task-number: QTBUG-9241
| * | Compile in namespaceAaron Kennedy2010-03-221-1/+1
| | |
| * | Deprecate inline Script {} blocksAaron Kennedy2010-03-2218-23/+349
| | | | | | | | | | | | | | | | | | | | | | | | Inline blocks/includes have been replaced with an import syntax: import "foo.js" as Foo this gives better separation between QML and code. Imported script blocks also have a mandatory qualifier, which leads to better optimization potential.
| * | Removed wrong parenthesis around property NOTIFY declarationLeonardo Sobral Cunha2010-03-221-1/+1
| | |