Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Make autotests work with qreal == float (in addition to double). | Warwick Allison | 2010-07-02 | 1 | -1/+1 |
| | | | | Task-number: QTBUG-11853 | ||||
* | Usefully convert from QtScript object/array to QVariant | Kent Hansen | 2010-06-17 | 2 | -3/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For arrays, the conversion would crash if the array was cyclic. Introduce a set that keeps track of which objects are being converted, and return an empty list when a cycle is detected. For other types of objects, the object was previously attempted to be converted to a primitive, which typically meant you would get the string representation ("[object Object]"), since most (practically all) objects can be converted to a string -- not useful at all. Change the conversion so it converts the object to a QVariantMap instead. This was already done for slots that took a QVariantMap as argument, but only one level deep. Make the conversion recursive, using the same mechanism as for arrays to detect cycles. This change also means that you get a meaningful JS object => QVariant => JS object roundtrip. It also aligns the behavior with the Qt WebKit bridge. Update the documentation to describe the new behavior. The 4.7 changelog will also be updated under "important behavioral changes". This change exposed an issue with one of the QML autotests: A JS object was assigned to a QVariant property, which caused it to be converted to a string (rather than a QVariantMap) -- just shows that the previous behavior was unintuitive). Later, this variant property is compared to another object, the intention being to compare the _properties_ of the two objects; but because the variant property contained a string, this would cause the other operand (object) to be converted to a string as well ("[object Object]"), causing a meaningless test pass. Change the test to deserialize both objects using JSON.stringify, and compare the resulting strings, so that actual JS object => QVariant(Map) => JS object roundtrip is tested (the intention). Task-number: QTBUG-3511 Reviewed-by: Olivier Goffart | ||||
* | Make declarative autotests compile on Symbian abld build system | Joona Petrell | 2010-06-08 | 2 | -3/+6 |
| | | | | | Task-number: Reviewed-by: Martin Jones | ||||
* | Allow js files with '.pragma library' to be used from WorkerScript | Bea Lam | 2010-05-26 | 7 | -29/+76 |
| | |||||
* | Remove license headers from test data. | Warwick Allison | 2010-05-23 | 1 | -41/+0 |
| | | | | Partial revert of d5a86d924bfe331aeba6465b0f249cd27ef83ad4 | ||||
* | Add license headers for .qml files. | Jason McDonald | 2010-05-21 | 1 | -0/+41 |
| | | | | | | | Examples get the BSD license, while all other .qml files get the LGPL/tech-preview license. Reviewed-by: Trust Me | ||||
* | Symbian build fix to declarative auto and benchmark tests | Joona Petrell | 2010-05-14 | 1 | -1/+8 |
| | | | | | Task-number: QTBUG-9491 Reviewed-by: Martin Jones | ||||
* | Fix versioning of Qt Declarative's in-built types | Alan Alpert | 2010-04-21 | 1 | -1/+1 |
| | | | | | | Since we aren't releasing for 4.6, all types are new in 4.7. Task-number: QTBUG-10081 | ||||
* | Rename remaining import Qt 4.6 lines to import Qt 4.7 | Joona Petrell | 2010-04-14 | 1 | -1/+1 |
| | | | | | Task-number: Reviewed-by: Martin Jones | ||||
* | Tweak tests to run in parallel | Aaron Kennedy | 2010-04-13 | 1 | -0/+3 |
| | |||||
* | Replace "property var " with "property variant " in QML code | Aaron Kennedy | 2010-04-09 | 1 | -1/+1 |
| | |||||
* | Remove expected warning | Bea Lam | 2010-03-08 | 2 | -19/+2 |
| | |||||
* | Make test compile | Bea Lam | 2010-03-08 | 1 | -3/+3 |
| | |||||
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Bea Lam | 2010-03-05 | 2 | -11/+13 |
|\ | | | | | | | | | Conflicts: tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp | ||||
| * | Fix tests failing due to javascript eval errors. | Bea Lam | 2010-03-04 | 2 | -11/+13 |
| | | |||||
* | | Fix test leaks | Bea Lam | 2010-03-05 | 1 | -0/+4 |
|/ | |||||
* | Increase test timer | Bea Lam | 2010-03-03 | 1 | -1/+2 |
| | |||||
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Bea Lam | 2010-03-03 | 1 | -1/+1 |
|\ | |||||
| * | Fix url in source() test. | Bea Lam | 2010-03-03 | 1 | -1/+1 |
| | | |||||
* | | Fix test to listen for signal instead of try-waiting for property. | Bea Lam | 2010-03-03 | 2 | -7/+11 |
|/ | |||||
* | Add WorkerScript docs and tests. | Bea Lam | 2010-03-03 | 4 | -0/+225 |
Task-number: QT-2807 |