Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Alan Alpert | 2010-03-30 | 79 | -957/+1542 |
|\ | |||||
| * | Fix qml plugin loading with specified path in qmldir | mae | 2010-03-30 | 1 | -3/+8 |
| | | | | | | | | | | | | The fix makes it possible to specify an ABSOLUTE path as well, e.g.: plugin mimehunt C:\sys\bin | ||||
| * | Optimization: Use internal QGraphicsItemPrivate::setItemParentHelper() | Aaron Kennedy | 2010-03-30 | 1 | -4/+12 |
| | | | | | | | | | | This brings the "data" property inline with the "children" property. Improves the declarative/creation/itemtree_qml test by 13%. | ||||
| * | Move basic focusscope examples into auto tests. | Yann Bodson | 2010-03-30 | 9 | -20/+306 |
| | | |||||
| * | Correctly construct boolean JSValue's | Aaron Kennedy | 2010-03-30 | 3 | -3/+47 |
| | | | | | | | | Task-number: QTBUG-9205 | ||||
| * | Update QmlChanges for SmoothedAnimation | Leonardo Sobral Cunha | 2010-03-30 | 1 | -0/+33 |
| | | |||||
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Martin Jones | 2010-03-30 | 50 | -816/+1036 |
| |\ | |||||
| | * | WorkerScript was receiving events after deletion and trying to process | Bea Lam | 2010-03-30 | 2 | -8/+9 |
| | | | | | | | | | | | | these events. | ||||
| | * | Make visual tests run on windows | Martin Jones | 2010-03-30 | 1 | -1/+2 |
| | | | |||||
| | * | Fixes PathView compile warnings | Leonardo Sobral Cunha | 2010-03-30 | 2 | -2/+2 |
| | | | |||||
| | * | Finished file rename of qdeclarative easefollow to smoothedanimation | Leonardo Sobral Cunha | 2010-03-30 | 25 | -33/+32 |
| | | | |||||
| | * | Change and rename qml EaseFollow to SmoothedAnimation | Leonardo Sobral Cunha | 2010-03-30 | 25 | -386/+609 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QDeclarativeSmoothedAnimation inherits from QDeclarativeNumberAnimation, as a consequence SmoothedAnimation can be used inside Behaviors and as PropertySourceValues, like any other animation. The old EaseFollow properties changed to comply with the other declarative animations ('source' changed to 'to'), so now 'to' changes are not automatically 'followed' anymore. You can achieve the following behavior by putting a SmoothedAnimation inside a Behavior of a property that is bound to another, as the following example: If you want to follow an hypothetical rect1, you should do now: Rectangle { color: "green" width: 60; height: 60; x: rect1.x - 5; y: rect1.y - 5; Behavior on x { SmoothedAnimation { velocity: 200 } } Behavior on y { SmoothedAnimation { velocity: 200 } } } SmoothedAnimation also supports animating multiple target(s)/property(ies) in the transition case. When a QDeclarativeSmoothedAnimation is restarted, it will match the QDeclarativeProperty which were being animated and transfer the corresponding track velocity to the new starting animations. QSmoothedAnimation is an uncontrolled animation, duration == -1. The duration is set as -1 to avoid consecutive animation state changes stop()/start(). This is particularly useful when using QSmoothAnimation to 'follow' another property, which is also being animated (change the 'to' property every tick). Reviewed-by: Michael Brasser | ||||
| | * | Fix parenting after 6f88388db4e8e202780d789e66664ff824691948. | Michael Brasser | 2010-03-30 | 8 | -35/+31 |
| | | | |||||
| * | | Make qmlpixmapcache thread shutdown cleaner | Martin Jones | 2010-03-30 | 1 | -12/+6 |
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change to Thiago's method: QThread::quit() is *not* thread-safe, so we mustn't call it from outside the QThread that the QThread holds. Unlike other QObjects, this method and some others must not be called from the thread they have affinity to. So add a hack to call it in the auxiliary thread. Do that by connecting a dummy QObject's destroyed() signal to the quit() slot in a DirectConnection, then move the object to the thread. When we call deleteLater(), this will cause the thread's event loop to delete the object, which in turn calls quit() in the actual thread. Reviewed-by: Thiago Macieira | ||||
| * | Fix viewer resizing on reload and File->open | Martin Jones | 2010-03-30 | 2 | -17/+17 |
| | | | | | | | | Task-number: QTBUG-9325 | ||||
| * | Don't emit onPositionChanged before onPressed | Martin Jones | 2010-03-30 | 1 | -1/+0 |
| | | | | | | | | Task-number: QTBUG-9383 | ||||
| * | Make QDeclarativeListProperty a class | Aaron Kennedy | 2010-03-30 | 2 | -2/+4 |
| | | | | | | | | Apparently structs are not socially acceptable. | ||||
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Aaron Kennedy | 2010-03-30 | 10 | -77/+65 |
| |\ | | | | | | | | | | | | | Conflicts: tests/auto/declarative/qdeclarativedom/tst_qdeclarativedom.cpp | ||||
| | * | Correctly parent repeater items. | Michael Brasser | 2010-03-30 | 1 | -5/+5 |
| | | | |||||
| | * | Make sure cursor delegate is parented. | Michael Brasser | 2010-03-29 | 2 | -0/+4 |
| | | | | | | | | | | | | setParentItem no longer sets QObject parent. | ||||
| | * | Allow just one dimension to be set, the other scaled accordingly | Warwick Allison | 2010-03-29 | 1 | -3/+11 |
| | | | | | | | | | | | | Task-number: QTBUG-8984 | ||||
| | * | Simplify import path. | Warwick Allison | 2010-03-29 | 4 | -59/+45 |
| | | | | | | | | | | | | Reviewed-by: mae | ||||
| | * | Removed unneeded code. | Roberto Raggi | 2010-03-29 | 2 | -10/+0 |
| | | | |||||
| * | | Fix qdeclarativedom::loadDynamicProperty test | Aaron Kennedy | 2010-03-30 | 2 | -6/+10 |
| | | | |||||
* | | | Fix installation of qmldir files | Alan Alpert | 2010-03-30 | 4 | -4/+4 |
| |/ |/| | | | | | | | | | | | The old pro files did not actually install the qmldir files in clean builds. These ones should work. Reviewed-by: Harald Fernengel | ||||
* | | Update autotest a little | Alan Alpert | 2010-03-29 | 1 | -4/+2 |
|/ | | | | | | variant property was removed, and data property was altered, without updating this autotest. However the remaining failure for date appears to be genuine | ||||
* | Improve QML compiler statistics | Aaron Kennedy | 2010-03-29 | 2 | -9/+45 |
| | |||||
* | Use error enum not numbers | Warwick Allison | 2010-03-29 | 1 | -2/+2 |
| | | | | (easier to doc) | ||||
* | Pass test. | Warwick Allison | 2010-03-29 | 1 | -0/+14 |
| | |||||
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Warwick Allison | 2010-03-29 | 16 | -65/+200 |
|\ | |||||
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Martin Jones | 2010-03-29 | 1 | -4/+0 |
| |\ | |||||
| | * | QDeclarativeItem::setParentItem should not modify the QObject parent | Aaron Kennedy | 2010-03-29 | 1 | -4/+0 |
| | | | | | | | | | | | | QTBUG-5768 | ||||
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Martin Jones | 2010-03-29 | 7 | -50/+45 |
| |\ \ | | |/ | |||||
| | * | Doc | Aaron Kennedy | 2010-03-29 | 1 | -45/+40 |
| | | | | | | | | | | | | QTBUG-7998 | ||||
| | * | Visual test fixes. | Michael Brasser | 2010-03-29 | 5 | -4/+4 |
| | | | |||||
| | * | Doc | Aaron Kennedy | 2010-03-29 | 1 | -1/+1 |
| | | | | | | | | | | | | QTBUG-9273 | ||||
| * | | Ensure currentIndex is updated when PathView items are removed/moved | Martin Jones | 2010-03-29 | 2 | -8/+37 |
| |/ | |||||
| * | Relayout items when Flow size changes. | Martin Jones | 2010-03-29 | 4 | -0/+103 |
| | | | | | | | | | | | | Also add Flow tests. Task-number: QTBUG-9421 | ||||
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Martin Jones | 2010-03-29 | 48 | -528/+1083 |
| |\ | |||||
| * | | Make sure the image reader thread is shutdown properly | Martin Jones | 2010-03-29 | 1 | -2/+14 |
| | | | | | | | | | | | | | | | Prevents deadlock on shutdown for very shortlived runs, e.g. autotests | ||||
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Martin Jones | 2010-03-29 | 9 | -29/+32 |
| |\ \ | |||||
| * \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Martin Jones | 2010-03-29 | 690 | -318/+475 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Martin Jones | 2010-03-28 | 43 | -151/+399 |
| |\ \ \ \ | |||||
| * | | | | | Fix change description: Import -> import | Martin Jones | 2010-03-28 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | doc | Warwick Allison | 2010-03-29 | 1 | -4/+70 |
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9459 QTBUG-9458 | ||||
* | | | | | | test error code too | Warwick Allison | 2010-03-29 | 1 | -3/+5 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Optimization: reduce allocations | Aaron Kennedy | 2010-03-29 | 2 | -4/+4 |
| | | | | | |||||
* | | | | | Doc. | Michael Brasser | 2010-03-29 | 1 | -0/+5 |
| | | | | | |||||
* | | | | | Doc | Aaron Kennedy | 2010-03-29 | 1 | -2/+1 |
| | | | | | |||||
* | | | | | Remove "variant" QML properties | Aaron Kennedy | 2010-03-29 | 3 | -4/+1 |
| | | | | | | | | | | | | | | | | | | | | "property var a" works just as well |