summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlWarwick Allison2010-02-265-48/+71
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-2626-383/+469
| |\
| | * Revert "Some animation cleanup/refactoring."Leonardo Sobral Cunha2010-02-262-20/+12
| | | | | | | | | | | | This reverts commit b5700759da7bccf0ccd6e20b1727950532894ad2.
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-2622-290/+399
| |\ \
| * | | Make Flickable overshoot behavior nicer.Martin Jones2010-02-263-27/+58
| | | |
| * | | Tiny doc tweak.Martin Jones2010-02-261-1/+1
| | | |
* | | | missed renameWarwick Allison2010-02-261-1/+1
| |_|/ |/| |
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlWarwick Allison2010-02-2610-213/+400
|\ \ \
| * | | DocAaron Kennedy2010-02-262-13/+150
| | | |
| * | | update painted geometry on pixmapChanged rather than sourceChangedYann Bodson2010-02-262-10/+3
| | |/ | |/|
| * | Polish QDeclarativeProperty APIAaron Kennedy2010-02-267-190/+247
| | |
* | | Rename files to follow class name.Warwick Allison2010-02-2611-5/+5
| | | | | | | | | | | | Task-number: QT-2822
* | | Change Connection syntax as per QT-2822.Warwick Allison2010-02-2615-193/+157
|/ /
* | Test, demo, and work-around bug QTBUG-8535Warwick Allison2010-02-265-19/+34
| |
* | Fix ParentAnimation crash.Michael Brasser2010-02-262-3/+9
| |
* | Work around requires() bug in qmakeAaron Kennedy2010-02-263-6/+3
| | | | | | | | | | | | when running `qmake -r -tp vc', if any project is encountered which is disabled with requires(), the generated .sln file ends up missing many unrelated projects.
* | Make sure that QEasingCurve::type when streamed is a quint8, as documentedLeonardo Sobral Cunha2010-02-261-2/+2
| |
* | Add QEasingCurve to datastream format docsLeonardo Sobral Cunha2010-02-261-4/+15
| |
* | Move QEasingCurve datastream autotest to qdatastream for more comprehensive ↵Leonardo Sobral Cunha2010-02-262-54/+69
| | | | | | | | tests
* | Some animation cleanup/refactoring.Michael Brasser2010-02-262-12/+20
|/
* Fix Flickable.overShoot doc - it is a bool not a realMartin Jones2010-02-261-2/+2
|
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-2610-66/+277
|\
| * Rebuild since -declarative auto detection changed.Martin Jones2010-02-261-0/+0
| |
| * Remove unnecessary QDeclarativeProperty::Type enum valuesAaron Kennedy2010-02-263-22/+43
| |
| * Fix qdatastream::compatibility_Qt3 autotest failureLeonardo Sobral Cunha2010-02-261-2/+2
| |
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlBea Lam2010-02-266-7/+486
| |\
| * | Make compile following recent QDeclarativeProperty changesBea Lam2010-02-261-28/+28
| | |
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlBea Lam2010-02-25150-2175/+2768
| |\ \ | | | | | | | | | | | | | | | | Conflicts: src/declarative/qml/qdeclarativeproperty.cpp
| * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlBea Lam2010-02-2523-12/+471
| |\ \ \
| * \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlBea Lam2010-02-256-47/+45
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlBea Lam2010-02-25245-982/+24477
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/qml/qdeclarativemetaproperty.cpp
| * | | | | | Automatically connect to signals "onFooChanged" if property is "foo".Bea Lam2010-02-256-42/+232
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This follows on from a2a8cea2835ef24104fe784b6ce0f508cc5637c0 to make it work for PropertyChanges and QDeclarativeMetaProperty as well. Task-number: QT-2783
* | | | | | | Renamed Flickable viewportXXX properties contentXXXMartin Jones2010-02-2625-166/+147
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | A viewport is the thing you look through, not what you look at.
* | | | | | Add ParentAnimation.Michael Brasser2010-02-266-7/+486
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | ParentAnimation will replace ParentAction. It provides two advantages: * It will animate correctly when reversed. * It allows reparenting via another item, which is useful in the presence of clips, for example.
* | | | | Update test numbers after change to default transformOrigin.Michael Brasser2010-02-251-6/+4
| | | | | | | | | | | | | | | | | | | | Also make one comparison a bit more fuzzy.
* | | | | Protect against double initialization.Roberto Raggi2010-02-252-6/+20
| | | | |
* | | | | Compile on Linux: close(2) is defined in #include <unistd.h>Thiago Macieira2010-02-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me (cherry picked from commit 513395fa2e4ee8564a202a38584e1887c08f91db)
* | | | | Fix compilation due to enabling of QStringBuilder throughoutThiago Macieira2010-02-251-1/+1
| | | | |
* | | | | Fix compilation: intptr_t -> quintptrThiago Macieira2010-02-251-2/+2
| | | | |
* | | | | Merge branch 'master' of git:qt/qt-qmlThiago Macieira2010-02-252203-140276/+143703
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativeparticles.cpp
| * | | | | Don't look for contextual keywords when defining properties.Roberto Raggi2010-02-253-632/+658
| | | | | |
| * | | | | Introduced QDeclarativeExtensionPlugin::registerTypes(uri).Roberto Raggi2010-02-2514-35/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now, you have to reimplement registerTypes(uri) to expose native QML types, and initializeEngine(engine,uri) to add instances to the QML engine's root context.
| * | | | | Rename QDeclarativeMetaProperty -> QDeclarativePropertyAaron Kennedy2010-02-2553-520/+519
| | | | | | | | | | | | | | | | | | | | | | | | There's nothing meta about our properties.
| * | | | | Introduced alternative syntax for defining QML bindings.Roberto Raggi2010-02-257-1000/+1072
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now it is possible to define bindings using the `on' context keyword. For example, you can write Behavior on opacity { NumberAnimation { duration: 500 } } instead of opacity: Behavior { NumberAnimation { duration: 500 } }
| * | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-qmlJustin McPherson2010-02-254-12/+81
| |\ \ \ \ \
| | * | | | | Document and test resetting properties in a state change.Michael Brasser2010-02-253-1/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-1817
| | * | | | | Handle smooth reparenting where the item being reparented has a complexMichael Brasser2010-02-251-11/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | transform. Fixes pathview <-> details transition in flickr demo.
| * | | | | | Fix up some rename confusion.Justin McPherson2010-02-254-135/+3
| |/ / / / /
| * | | | | Make more private QDeclarativeMetaProperty methods privateAaron Kennedy2010-02-2516-89/+95
| | | | | |
| * | | | | docWarwick Allison2010-02-251-3/+1
| | |_|_|/ | |/| | |