Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7 | Eskil Abrahamsen Blomfeldt | 2010-03-25 | 83 | -1252/+1263 |
|\ | | | | | | | | | Conflicts: tests/auto/declarative/qdeclarativedom/data/importlib/sublib/qmldir | ||||
| * | itemChange() is now called when transformation properties change. | Yoann Lopes | 2010-03-25 | 2 | -6/+129 |
| | | | | | | | | | | | | | | | | | | | | | | | | When changing transformation properties (i.e., setRotation(), setScale(), setTransformOriginPoint()), itemChange() is now called to allow notification and change of the values. The flag ItemSendsGeometryChanges needs to be set to enable this. Autotest included. Task-number: QTBUG-8112 Reviewed-by: alexis | ||||
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7 | Eskil Abrahamsen Blomfeldt | 2010-03-25 | 79 | -1243/+1128 |
| |\ | | | | | | | | | | | | | Conflicts: tests/auto/declarative/qdeclarativedom/data/importlib/sublib/qmldir | ||||
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵ | Qt Continuous Integration System | 2010-03-25 | 3 | -21/+53 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Add QFont::ForceIntegerMetrics style strategy flag Auto test for commit 4a4458d1cf5ec7885c6f63f739b7ee80c70ad211 | ||||
| | * \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵ | Qt Continuous Integration System | 2010-03-25 | 2 | -9/+9 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 McPherson | 2010-03-25 | 2 | -9/+9 |
| | | | | | | | | | | | | | | | | | | | | Reviewed-by: Dmytro Poplavskiy | ||||
| | * | | | Qt.Infinite -> Animation.Infinite | Michael Brasser | 2010-03-25 | 7 | -12/+48 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Too misleading to have on the Qt object, as it only means infinite for animation loops. | ||||
| | * | | | Doc fix. | Michael Brasser | 2010-03-25 | 3 | -3/+3 |
| | | | | | |||||
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Aaron Kennedy | 2010-03-25 | 10 | -38/+81 |
| | |\ \ \ | |||||
| | | * \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Martin Jones | 2010-03-25 | 7 | -34/+50 |
| | | |\ \ \ | |||||
| | | | * | | | Replace Animation's repeat property with loops. | Michael Brasser | 2010-03-25 | 7 | -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 currentIndex | Martin Jones | 2010-03-25 | 2 | -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.7 | Martin Jones | 2010-03-24 | 10 | -23/+33 |
| | | |\ \ \ \ | |||||
| | | * | | | | | Compile with qtnamespace | Martin Jones | 2010-03-24 | 1 | -1/+2 |
| | | | | | | | | |||||
| | * | | | | | | Remove faulty assert - the precondition is checked for correctly later on | Aaron Kennedy | 2010-03-25 | 1 | -2/+1 |
| | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9336 | ||||
| | * | | | | | Fix compile in namespace. | Michael Brasser | 2010-03-24 | 1 | -2/+2 |
| | | |/ / / | | |/| | | | |||||
| | * | | | | Merge remote branch 'origin/4.7' into HEAD | Thiago Macieira | 2010-03-24 | 9 | -23/+23 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | | Conflicts: src/declarative/qml/qdeclarativecompiler.cpp | ||||
| | * | | | | Disallow the implicit QDeclarativeGuardedContextData copy constructor | Aaron Kennedy | 2010-03-24 | 1 | -0/+10 |
| | | |/ / | | |/| | | | | | | | | | | | | Task-number: QTBUG-9312 | ||||
| | * | | | Merge branch '4.7' of ../qt-4.7 into 4.7 | Martin Jones | 2010-03-24 | 4 | -4/+33 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/declarative/qdeclarativedom/data/importlib/sublib/qmldir | ||||
| | * | | | | Fix leak. | Michael Brasser | 2010-03-24 | 1 | -1/+2 |
| | | | | | | |||||
| | * | | | | StateChangeScript doc. | Michael Brasser | 2010-03-24 | 1 | -2/+24 |
| | | | | | | |||||
| | * | | | | A StateChangeScript should never be run when leaving the state. | Michael Brasser | 2010-03-24 | 2 | -5/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For a Transition running in reverse, stop ScriptAction from running any StateSchageScripts. | ||||
| | * | | | | ScriptAction doc. | Michael Brasser | 2010-03-24 | 1 | -0/+31 |
| | | | | | | |||||
| | * | | | | Rename stateChangeScriptName to scriptName. | Michael Brasser | 2010-03-24 | 3 | -3/+4 |
| | | | | | | |||||
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Martin Jones | 2010-03-24 | 16 | -203/+185 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Warwick Allison | 2010-03-24 | 11 | -92/+175 |
| | | |\ \ \ \ | |||||
| | | | * | | | | Fix abort in flipable | Leonardo Sobral Cunha | 2010-03-24 | 1 | -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 Lam | 2010-03-24 | 8 | -8/+52 |
| | | | | | | | | |||||
| | | | * | | | | Properly use one thread for all instances of XmlListModel. | Bea Lam | 2010-03-24 | 2 | -83/+122 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-2831 | ||||
| | | * | | | | | Remove support for QML-in-HTML-in-WebView | Warwick Allison | 2010-03-24 | 2 | -88/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, this feature too prone to accidental misuse and abuse. | ||||
| | | * | | | | | Revert 95aa8c8fc76e2309a629b05994a2677b0887140b. | Warwick Allison | 2010-03-24 | 6 | -55/+0 |
| | | |/ / / / | |||||
| | | * | | | | Make compile. | Michael Brasser | 2010-03-24 | 1 | -1/+1 |
| | | | | | | | |||||
| | | * | | | | Output all Loader errors. | Michael Brasser | 2010-03-24 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we were not outputting those that occurred on component->create(). | ||||
| | | * | | | | Fix Loader leak when loading a non-QGraphicsObject object. | Michael Brasser | 2010-03-24 | 1 | -1/+5 |
| | | | | | | | |||||
| | | * | | | | Use setParent_NoEvent in Loader and benchmark Loader performance. | Michael Brasser | 2010-03-24 | 1 | -2/+3 |
| | | | | | | | |||||
| | | * | | | | Animation construction optimization. | Michael Brasser | 2010-03-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use setParent_NoEvent when parenting to group. | ||||
| | | * | | | | Origin safety testing for imported resources. | Warwick Allison | 2010-03-24 | 5 | -13/+48 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extends upon 95aa8c8fc76e2309a629b05994a2677b0887140b. Still under discussion. | ||||
| | * | | | | | Fix flicking views at boundary with StricthighlighRange | Martin Jones | 2010-03-24 | 2 | -37/+49 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9256 | ||||
| | * | | | | | Doc: ids start with lowercase | Martin Jones | 2010-03-24 | 1 | -9/+9 |
| | |/ / / / | |||||
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7 | Warwick Allison | 2010-03-23 | 12 | -53/+67 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/declarative/qdeclarativedom/data/importlib/sublib/qmldir | ||||
| | * \ \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7 | Warwick Allison | 2010-03-23 | 2 | -21/+14 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/declarative/qdeclarativedom/data/importlib/sublib/qmldir | ||||
| | * | | | | | | Fix warning. | Michael Brasser | 2010-03-23 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | Changing the alignment property should trigger a repaint. | Alexis Menard | 2010-03-23 | 1 | -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.7 | Warwick Allison | 2010-03-23 | 9 | -272/+58 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | Change default RotationAnimation direction. | Michael Brasser | 2010-03-23 | 2 | -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 Brasser | 2010-03-23 | 4 | -7/+41 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-8816 | ||||
| | | * | | | | | | Remove ParentAction. | Michael Brasser | 2010-03-23 | 6 | -256/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It has been replaced with ParentAnimation. | ||||
| | | * | | | | | | Fix mutex handling that was causing tests to sometimes crash/fail. | Bea Lam | 2010-03-23 | 1 | -2/+2 |
| | | | | | | | | | |||||
| | * | | | | | | | Basic Loader origin safety (for discussion). | Warwick Allison | 2010-03-23 | 3 | -0/+21 |
| | |/ / / / / / | |||||
| | * | | | | | | Manual merge. | Warwick Allison | 2010-03-22 | 7 | -9/+81 |
| | | | | | | | |