summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'main/4.7' into 4.7Morten Johan Sørvig2010-03-2579-1242/+1127
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-03-252-9/+9
| |\
| | * Rename loopCount to loops, in line with other declarative elements.Justin McPherson2010-03-252-9/+9
| * | Qt.Infinite -> Animation.InfiniteMichael Brasser2010-03-257-12/+48
| * | 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
| | * | | 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-2410-23/+33
| | |\ \ \
| | * | | | Compile with qtnamespaceMartin Jones2010-03-241-1/+2
| * | | | | Remove faulty assert - the precondition is checked for correctly later onAaron Kennedy2010-03-251-2/+1
| | |_|/ / | |/| | |
| * | | | Fix compile in namespace.Michael Brasser2010-03-241-2/+2
| | |/ / | |/| |
| * | | Merge remote branch 'origin/4.7' into HEADThiago Macieira2010-03-249-23/+23
| |\ \ \ | | | |/ | | |/|
| * | | Disallow the implicit QDeclarativeGuardedContextData copy constructorAaron Kennedy2010-03-241-0/+10
| | |/ | |/|
| * | Merge branch '4.7' of ../qt-4.7 into 4.7Martin Jones2010-03-244-4/+33
| |\ \
| * | | 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-243-3/+4
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-2416-203/+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
| | | * | | 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
| | * | | | Remove support for QML-in-HTML-in-WebViewWarwick Allison2010-03-242-88/+0
| | * | | | 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
| | * | | 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
| | * | | Origin safety testing for imported resources.Warwick Allison2010-03-245-13/+48
| * | | | Fix flicking views at boundary with StricthighlighRangeMartin Jones2010-03-242-37/+49
| * | | | Doc: ids start with lowercaseMartin Jones2010-03-241-9/+9
| |/ / /
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Warwick Allison2010-03-2312-53/+67
| |\ \ \
| * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Warwick Allison2010-03-232-21/+14
| |\ \ \ \
| * | | | | Fix warning.Michael Brasser2010-03-231-1/+1
| * | | | | Changing the alignment property should trigger a repaint.Alexis Menard2010-03-231-0/+1
| * | | | | 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
| | * | | | | Add missing NOTIFYs.Michael Brasser2010-03-234-7/+41
| | * | | | | Remove ParentAction.Michael Brasser2010-03-236-256/+7
| | * | | | | 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
| * | | | | Add Script removal to QmlChanges.txtMartin Jones2010-03-221-0/+38
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-2251-673/+489
| |\ \ \ \ \