Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Warwick Allison | 2010-02-26 | 5 | -48/+71 |
|\ | |||||
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Martin Jones | 2010-02-26 | 26 | -383/+469 |
| |\ | |||||
| | * | Revert "Some animation cleanup/refactoring." | Leonardo Sobral Cunha | 2010-02-26 | 2 | -20/+12 |
| | | | | | | | | | | | | This reverts commit b5700759da7bccf0ccd6e20b1727950532894ad2. | ||||
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Martin Jones | 2010-02-26 | 22 | -290/+399 |
| |\ \ | |||||
| * | | | Make Flickable overshoot behavior nicer. | Martin Jones | 2010-02-26 | 3 | -27/+58 |
| | | | | |||||
| * | | | Tiny doc tweak. | Martin Jones | 2010-02-26 | 1 | -1/+1 |
| | | | | |||||
* | | | | missed rename | Warwick Allison | 2010-02-26 | 1 | -1/+1 |
| |_|/ |/| | | |||||
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Warwick Allison | 2010-02-26 | 10 | -213/+400 |
|\ \ \ | |||||
| * | | | Doc | Aaron Kennedy | 2010-02-26 | 2 | -13/+150 |
| | | | | |||||
| * | | | update painted geometry on pixmapChanged rather than sourceChanged | Yann Bodson | 2010-02-26 | 2 | -10/+3 |
| | |/ | |/| | |||||
| * | | Polish QDeclarativeProperty API | Aaron Kennedy | 2010-02-26 | 7 | -190/+247 |
| | | | |||||
* | | | Rename files to follow class name. | Warwick Allison | 2010-02-26 | 11 | -5/+5 |
| | | | | | | | | | | | | Task-number: QT-2822 | ||||
* | | | Change Connection syntax as per QT-2822. | Warwick Allison | 2010-02-26 | 15 | -193/+157 |
|/ / | |||||
* | | Test, demo, and work-around bug QTBUG-8535 | Warwick Allison | 2010-02-26 | 5 | -19/+34 |
| | | |||||
* | | Fix ParentAnimation crash. | Michael Brasser | 2010-02-26 | 2 | -3/+9 |
| | | |||||
* | | Work around requires() bug in qmake | Aaron Kennedy | 2010-02-26 | 3 | -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 documented | Leonardo Sobral Cunha | 2010-02-26 | 1 | -2/+2 |
| | | |||||
* | | Add QEasingCurve to datastream format docs | Leonardo Sobral Cunha | 2010-02-26 | 1 | -4/+15 |
| | | |||||
* | | Move QEasingCurve datastream autotest to qdatastream for more comprehensive ↵ | Leonardo Sobral Cunha | 2010-02-26 | 2 | -54/+69 |
| | | | | | | | | tests | ||||
* | | Some animation cleanup/refactoring. | Michael Brasser | 2010-02-26 | 2 | -12/+20 |
|/ | |||||
* | Fix Flickable.overShoot doc - it is a bool not a real | Martin Jones | 2010-02-26 | 1 | -2/+2 |
| | |||||
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Martin Jones | 2010-02-26 | 10 | -66/+277 |
|\ | |||||
| * | Rebuild since -declarative auto detection changed. | Martin Jones | 2010-02-26 | 1 | -0/+0 |
| | | |||||
| * | Remove unnecessary QDeclarativeProperty::Type enum values | Aaron Kennedy | 2010-02-26 | 3 | -22/+43 |
| | | |||||
| * | Fix qdatastream::compatibility_Qt3 autotest failure | Leonardo Sobral Cunha | 2010-02-26 | 1 | -2/+2 |
| | | |||||
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Bea Lam | 2010-02-26 | 6 | -7/+486 |
| |\ | |||||
| * | | Make compile following recent QDeclarativeProperty changes | Bea Lam | 2010-02-26 | 1 | -28/+28 |
| | | | |||||
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Bea Lam | 2010-02-25 | 150 | -2175/+2768 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: src/declarative/qml/qdeclarativeproperty.cpp | ||||
| * \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Bea Lam | 2010-02-25 | 23 | -12/+471 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Bea Lam | 2010-02-25 | 6 | -47/+45 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Bea Lam | 2010-02-25 | 245 | -982/+24477 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/qml/qdeclarativemetaproperty.cpp | ||||
| * | | | | | | Automatically connect to signals "onFooChanged" if property is "foo". | Bea Lam | 2010-02-25 | 6 | -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 contentXXX | Martin Jones | 2010-02-26 | 25 | -166/+147 |
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | A viewport is the thing you look through, not what you look at. | ||||
* | | | | | | Add ParentAnimation. | Michael Brasser | 2010-02-26 | 6 | -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 Brasser | 2010-02-25 | 1 | -6/+4 |
| | | | | | | | | | | | | | | | | | | | | Also make one comparison a bit more fuzzy. | ||||
* | | | | | Protect against double initialization. | Roberto Raggi | 2010-02-25 | 2 | -6/+20 |
| | | | | | |||||
* | | | | | Compile on Linux: close(2) is defined in #include <unistd.h> | Thiago Macieira | 2010-02-25 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me (cherry picked from commit 513395fa2e4ee8564a202a38584e1887c08f91db) | ||||
* | | | | | Fix compilation due to enabling of QStringBuilder throughout | Thiago Macieira | 2010-02-25 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Fix compilation: intptr_t -> quintptr | Thiago Macieira | 2010-02-25 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | Merge branch 'master' of git:qt/qt-qml | Thiago Macieira | 2010-02-25 | 2203 | -140276/+143703 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativeparticles.cpp | ||||
| * | | | | | Don't look for contextual keywords when defining properties. | Roberto Raggi | 2010-02-25 | 3 | -632/+658 |
| | | | | | | |||||
| * | | | | | Introduced QDeclarativeExtensionPlugin::registerTypes(uri). | Roberto Raggi | 2010-02-25 | 14 | -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 -> QDeclarativeProperty | Aaron Kennedy | 2010-02-25 | 53 | -520/+519 |
| | | | | | | | | | | | | | | | | | | | | | | | | There's nothing meta about our properties. | ||||
| * | | | | | Introduced alternative syntax for defining QML bindings. | Roberto Raggi | 2010-02-25 | 7 | -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-qml | Justin McPherson | 2010-02-25 | 4 | -12/+81 |
| |\ \ \ \ \ | |||||
| | * | | | | | Document and test resetting properties in a state change. | Michael Brasser | 2010-02-25 | 3 | -1/+69 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-1817 | ||||
| | * | | | | | Handle smooth reparenting where the item being reparented has a complex | Michael Brasser | 2010-02-25 | 1 | -11/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | transform. Fixes pathview <-> details transition in flickr demo. | ||||
| * | | | | | | Fix up some rename confusion. | Justin McPherson | 2010-02-25 | 4 | -135/+3 |
| |/ / / / / | |||||
| * | | | | | Make more private QDeclarativeMetaProperty methods private | Aaron Kennedy | 2010-02-25 | 16 | -89/+95 |
| | | | | | | |||||
| * | | | | | doc | Warwick Allison | 2010-02-25 | 1 | -3/+1 |
| | |_|_|/ | |/| | | |