Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Warwick Allison | 2010-04-08 | 18 | -96/+232 |
|\ | |||||
| * | Make script and binding assignments identical for list properties | Aaron Kennedy | 2010-04-08 | 1 | -1/+5 |
| | | |||||
| * | Fix qdeclarativeecmascript::arrayExpression() test | Aaron Kennedy | 2010-04-08 | 1 | -1/+1 |
| | | |||||
| * | Cleanup handling of errors in bindings and scripts | Aaron Kennedy | 2010-04-08 | 18 | -96/+228 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | QML used to silently ignore a log of errors - such as a failed assignment to a QObject property. These errors are now all reported as exceptions in JavaScript. Other questionable activities, like assigning a JavaScript array to a "property var" property which appeared to work, thanks to QtScript's transparent conversion of arrays to a QVariantList, are now blocked entirely. QTBUG-9152 QTBUG-9382 QTBUG-9341 QTBUG-6886 | ||||
* | | Add running of examples to quality gate. | Warwick Allison | 2010-04-08 | 6 | -7/+8 |
|/ | | | | Fix broken examples too. | ||||
* | Improve velocity example | Yann Bodson | 2010-04-08 | 4 | -135/+84 |
| | |||||
* | Missing file | Aaron Kennedy | 2010-04-08 | 2 | -1/+146 |
| | |||||
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Warwick Allison | 2010-04-08 | 205 | -216/+939 |
|\ | |||||
| * | Fix tst_qdeclarativesmoothedanimation::behavior | Leonardo Sobral Cunha | 2010-04-08 | 1 | -2/+3 |
| | | | | | | | | Added an 'id' to the animations inside Behaviors to avoid deferred creation. | ||||
| * | Add SmoothedFollow element to qml | Leonardo Sobral Cunha | 2010-04-08 | 13 | -1/+695 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The SmoothedFollow is the same as the old EaseFollow, so it's not an animation, but its main use case is to be used as a property value source to automatically follow the 'to' property, as in the example below. Rectangle { color: "green" width: 60; height: 60; SmoothedFollow on x { to: rect1.x - 5; velocity: 200 } SmoothedFollow on y { to: rect1.y - 5; velocity: 200 } } This element shares the internal implementation with SmoothedAnimation, both providing the same easing function, but with SmoothedFollow it's easier to set a start value to animate intially and then start to follow, while SmoothedAnimation is still convenient for using inside Behaviors and Transitions. Reviewed-by: Michael Brasser | ||||
| * | Tracking the velocity when restarting SmoothedAnimation | Leonardo Sobral Cunha | 2010-04-08 | 1 | -0/+2 |
| | | |||||
| * | Fix doc of qml's SmoothedAnimation | Leonardo Sobral Cunha | 2010-04-08 | 1 | -9/+10 |
| | | |||||
| * | Refactor in smoothedanimation, removed unneeded code | Leonardo Sobral Cunha | 2010-04-08 | 2 | -6/+1 |
| | | |||||
| * | Do not create a QScriptValue for an object being deleted | Aaron Kennedy | 2010-04-08 | 1 | -0/+3 |
| | | |||||
| * | Autotest for 76f5e9e7d1eea8d688d5459b7b7b2bfa3f9057ed | Aaron Kennedy | 2010-04-08 | 2 | -1/+19 |
| | | |||||
| * | Fix test. | Michael Brasser | 2010-04-08 | 1 | -0/+1 |
| | | |||||
| * | Replace "import Qt 4.6" with "import Qt 4.7" | Michael Brasser | 2010-04-08 | 183 | -196/+196 |
| | | |||||
| * | Don't optimized extended type construction | Aaron Kennedy | 2010-04-08 | 3 | -1/+9 |
| | | |||||
* | | Test readonly valuetypes. Fails for field. | Warwick Allison | 2010-04-08 | 5 | -0/+51 |
| | | | | | | | | Task-number: QTBUG-9685 | ||||
* | | Fix AnimatedImage for remote image test. Fix and test sourceSize property. | Warwick Allison | 2010-04-08 | 6 | -2/+44 |
| | | |||||
* | | Ignore current spurious warnings. | Warwick Allison | 2010-04-08 | 1 | -0/+10 |
| | | | | | | | | Task-number: QT-3245 | ||||
* | | unwarn | Warwick Allison | 2010-04-08 | 1 | -0/+2 |
|/ | |||||
* | Correctly handle shutdown order in the presence of QWidgets | Aaron Kennedy | 2010-04-08 | 1 | -1/+1 |
| | | | | | The QWidget destructor is largely a copy of the QObject destructor. QML shutdown occurs in a slightly different order in this case. | ||||
* | Initialize QDeclarativeData even when not using a QDeclarativeEngine | Aaron Kennedy | 2010-04-08 | 2 | -5/+14 |
| | | | | Caused crashes in various test cases | ||||
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Warwick Allison | 2010-04-08 | 14 | -46/+76 |
|\ | |||||
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Martin Jones | 2010-04-08 | 11 | -301/+286 |
| |\ | |||||
| * \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Martin Jones | 2010-04-08 | 19 | -615/+242 |
| |\ \ | |||||
| * | | | Replace Text::wrap property with Text::wrapMode enumeration. | Martin Jones | 2010-04-08 | 14 | -46/+76 |
| | | | | | | | | | | | | | | | | wrap remains for a little while, and will produce a warning. | ||||
* | | | | Remove usage of Script where not actually testing the obsolete construct. | Warwick Allison | 2010-04-08 | 1 | -4/+3 |
| | | | | |||||
* | | | | Test import of a script requires qualifier. | Warwick Allison | 2010-04-08 | 3 | -0/+6 |
| | | | | |||||
* | | | | Fix location of error message. | Warwick Allison | 2010-04-08 | 1 | -2/+2 |
| | | | | |||||
* | | | | Remove error-tests of obsolete Script element. | Warwick Allison | 2010-04-08 | 25 | -120/+0 |
| |_|/ |/| | | |||||
* | | | Remove usage of Script where not actually testing the obsolete construct. | Warwick Allison | 2010-04-08 | 1 | -3/+1 |
| | | | |||||
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Warwick Allison | 2010-04-08 | 9 | -55/+89 |
|\ \ \ | | |/ | |/| | |||||
| * | | Revert "Add QListModelInterface::modelReset() signal and emit this in" | Bea Lam | 2010-04-08 | 6 | -43/+46 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 973cfce37fcdd1ce330f237eaa76930db55a73f6. Need more consideration before adding modelReset(). For example if item insertion/removal is supposed to trigger animations through added/removed signals, they won't be triggered if only the modelReset() signal is emitted. Also if we add modelReset(), it should also be implemented for ListModel to make sure it is implemented by all subclasses of QListModelInterface and to test the impact of this on the view classes. | ||||
| * | | Prevent Behavior from being triggered on initialization. | Michael Brasser | 2010-04-08 | 3 | -12/+43 |
| | | | | | | | | | | | | Task-number: QTBUG-6332 | ||||
* | | | Remove usage of Script where not actually testing the obsolete construct. | Warwick Allison | 2010-04-08 | 8 | -293/+279 |
| | | | |||||
* | | | Pass again, now that version must exist in order to be imported. | Warwick Allison | 2010-04-08 | 2 | -5/+6 |
|/ / | |||||
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Warwick Allison | 2010-04-08 | 17 | -511/+154 |
|\ \ | |||||
| * | | Remove flickr-desktop | Yann Bodson | 2010-04-08 | 6 | -500/+1 |
| |/ | |||||
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Martin Jones | 2010-04-08 | 19 | -301/+118 |
| |\ | |||||
| | * | Revert "Support QList<QObject*> properties" | Aaron Kennedy | 2010-04-08 | 16 | -297/+70 |
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 9d9161446bfad883c298d54a122e822c5e273a9c. This was a bad idea. It complicates the "property var" are not really JavaScript var problem. Some of the patch is valid, and it will be applied separately. | ||||
| | * | Document behavior of conflicting when clauses. | Michael Brasser | 2010-04-08 | 3 | -4/+48 |
| | | | | | | | | | | | | Task-number: QTBUG-9371 | ||||
| * | | Don't emit clicked() after pressAndHold() | Martin Jones | 2010-04-08 | 3 | -1/+45 |
| |/ | | | | | | | Task-number: QTBUG-9676 | ||||
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Martin Jones | 2010-04-08 | 17 | -75/+311 |
| |\ | |||||
| | * | Support QList<QObject*> properties | Aaron Kennedy | 2010-04-08 | 16 | -70/+297 |
| | | | | | | | | | | | | | | | | | | | | | We already supported returning QList<QObject*> from methods, but there wasn't really much that could be done with the return value. This closes the loop on QList<QObject*> support by allowing them to be properties, and used as models. | ||||
| * | | Fix setting of pointSize and pixelSize in different items. | Martin Jones | 2010-04-08 | 5 | -6/+60 |
| | | | | | | | | | | | | | | | | | | | | | Also ensure warning is issued regardless of the order both pointSize and pixelSize are set in the same item. Task-number: QTBUG-9665 | ||||
* | | | Give error if attempt to import from a version that is not installed. | Warwick Allison | 2010-04-08 | 2 | -3/+20 |
| | | | | | | | | | | | | | | | | | | (was done for builtins/plugins, but now also for qmldir-specified content) Task-number: QTBUG-9627 | ||||
* | | | Test actual error messages. Fix error messages. Test module-not-available error. | Warwick Allison | 2010-04-08 | 2 | -59/+133 |
| | | | |||||
* | | | needs focus | Warwick Allison | 2010-04-08 | 1 | -0/+1 |
| |/ |/| |