Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'kinetic-declarativeui' of ↵ | Michael Brasser | 2009-10-12 | 15 | -0/+114 |
|\ | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | I18n tests | Warwick Allison | 2009-10-12 | 7 | -0/+43 |
| | | |||||
| * | Test that Component {} is allowed as the root element | Aaron Kennedy | 2009-10-12 | 3 | -0/+23 |
| | | |||||
| * | Composite types should assign to object properties | Aaron Kennedy | 2009-10-12 | 6 | -0/+48 |
| | | | | | | | | Fixes QT-956 | ||||
* | | Behavior fix plus basic autotests. | Michael Brasser | 2009-10-12 | 10 | -0/+324 |
|/ | |||||
* | The root object is always last default object | Aaron Kennedy | 2009-10-12 | 2 | -0/+48 |
| | | | | Fix for QT-2301 | ||||
* | Add id aliases | Aaron Kennedy | 2009-10-09 | 2 | -0/+37 |
| | |||||
* | Support aliases to enum properties | Aaron Kennedy | 2009-10-09 | 3 | -0/+24 |
| | |||||
* | Tweak scope ordering (again) | Aaron Kennedy | 2009-10-09 | 2 | -13/+70 |
| | | | | | | ids and methods shadow properties. The reasoning is that the user explicitly declared these names, whereas they might not even know a property by that name exists. | ||||
* | Output file/line for script errors | Aaron Kennedy | 2009-10-09 | 3 | -0/+32 |
| | |||||
* | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-10-08 | 18 | -136/+277 |
|\ | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui-scriptopt | ||||
| * | Update list of tests | Warwick Allison | 2009-10-08 | 1 | -8/+16 |
| | | |||||
| * | Fix | Warwick Allison | 2009-10-08 | 1 | -1/+1 |
| | | |||||
| * | Update | Warwick Allison | 2009-10-08 | 1 | -3/+7 |
| | | | | | | | | Repeater is now *after* items. | ||||
| * | Follow -> SpringFollow | Warwick Allison | 2009-10-08 | 1 | -2/+2 |
| | | |||||
| * | Quieten | Warwick Allison | 2009-10-08 | 1 | -4/+13 |
| | | | | | | | | expect net error | ||||
| * | Update | Warwick Allison | 2009-10-08 | 1 | -47/+2 |
| | | | | | | | | NumberFormatter now only goes from number to (formatted) text. | ||||
| * | Remove spurious errors. | Warwick Allison | 2009-10-08 | 2 | -6/+16 |
| | | | | | | | | Others seem real. | ||||
| * | Update. | Warwick Allison | 2009-10-08 | 7 | -65/+77 |
| | | |||||
| * | WebView auto sizing test. | Warwick Allison | 2009-10-08 | 3 | -0/+143 |
| | | | | | | | | (image is just for doc, not in testscript) | ||||
* | | Fix crash | Aaron Kennedy | 2009-10-08 | 2 | -0/+23 |
| | | |||||
* | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-10-08 | 9 | -302/+370 |
|\ \ | |/ | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui-scriptopt | ||||
| * | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-10-08 | 3 | -1/+150 |
| |\ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-10-08 | 5 | -0/+119 |
| | |\ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * \ | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-10-07 | 17 | -43/+48 |
| | |\ \ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * \ \ | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-10-06 | 49 | -115/+1309 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | | | Auto tests for QmlTimer | Martin Jones | 2009-10-06 | 3 | -1/+150 |
| | | | | | | |||||
| * | | | | | Font-portable. | Warwick Allison | 2009-10-08 | 6 | -301/+220 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Self deleting binding test | Aaron Kennedy | 2009-10-08 | 4 | -0/+63 |
| | | | | | |||||
* | | | | | Fix test case | Aaron Kennedy | 2009-10-07 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | qWait() enters a nested event loop, so delete laters weren't being processed. | ||||
* | | | | | Fix test case | Aaron Kennedy | 2009-10-07 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | qWait() enters a nested event loop, so delete laters weren't being processed. | ||||
* | | | | | Fix test | Aaron Kennedy | 2009-10-07 | 1 | -1/+2 |
| | | | | | |||||
* | | | | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-10-07 | 74 | -162/+1616 |
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into test Conflicts: demos/declarative/samegame/content/samegame.js tests/auto/declarative/qmlecmascript/tst_qmlecmascript.cpp | ||||
| * | | | | Get two of those new autotests to pass. | Alan Alpert | 2009-10-07 | 4 | -21/+19 |
| | | | | | | | | | | | | | | | | | | | | The third will not pass until QT-2240 is fixed. | ||||
| * | | | | Add three failing tests to the QML ECMAscript autotest | Alan Alpert | 2009-10-07 | 5 | -0/+121 |
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | Tests the creation, deletion and toString functions for QML objects. Task-number: QT-2252 | ||||
| * | | | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-10-07 | 49 | -115/+1309 |
| |\ \ \ | | | |/ | | |/| | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵ | Michael Brasser | 2009-10-06 | 49 | -115/+1309 |
| | |\ \ | | | |/ | | |/| | | | | | kinetic-declarativeui | ||||
| | | * | Merge branch '4.5' into 4.6 | Thiago Macieira | 2009-10-06 | 1 | -6/+80 |
| | | |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/networkselftest/tst_networkselftest.cpp | ||||
| | | | * | Autotest: add a few more tests, with IP address and actual hostname | Thiago Macieira | 2009-10-06 | 1 | -4/+74 |
| | | | | | |||||
| | | | * | Autotest: use port 12346 instead of 1, to ensure that it's not a | Thiago Macieira | 2009-10-06 | 1 | -2/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | firewall issue Also check if we're not timing out instead of being able to fail. | ||||
| | | * | | QScriptContext::parentContext: don't skip unessecary frames | Olivier Goffart | 2009-10-06 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calling QScriptValue::call doesn't create a fake frame. We can detect a real fake frame as it does not have a callee. Task-number: QT-2270 Reviewed-by: Kent Hansen | ||||
| | | * | | tst_qnetworkreply: httpConnectionCount test improvements | Markus Goetz | 2009-10-06 | 1 | -3/+7 |
| | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe | ||||
| | | * | | add test for QT-2270 | Kent Hansen | 2009-10-06 | 1 | -0/+17 |
| | | | | | |||||
| | | * | | tst_qhttpnetworkconnection: Some more checks | Markus Goetz | 2009-10-06 | 1 | -2/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some more checks (test still passes) Reviewed-by: TrustMe | ||||
| | | * | | Merge commit 'origin/4.5' into 4.6 | Joerg Bornemann | 2009-10-06 | 2 | -0/+3 |
| | | |\ \ | | | | |/ | | | | | | | | | | | | | | | | Conflicts: tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp | ||||
| | | | * | tst_QGraphicsItem::QTBUG_4233_updateCachedWithSceneRect WinCE fix | Joerg Bornemann | 2009-10-06 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need some more time on Windows mobile to receive all events. Reviewed-by: thartman | ||||
| | | | * | tst_QGraphicsView::task245469_itemsAtPointWithClip Windows mobile fix | Joerg Bornemann | 2009-10-06 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We must make sure that the graphics view scene is centered to make this test work. On Windows mobile, the widget was too wide and the scene wasn't centered. Reviewed-by: thartman | ||||
| | | | * | tst_QGraphicsLinearLayout::layoutDirection fixed for Windows mobile | Joerg Bornemann | 2009-10-06 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test depends on a layout spacing set to 6. The Windows mobile style has layout spacing 8. Reviewed-by: mauricek | ||||
| | | * | | tst_qnetworkreply: Add ioPostToHttpsUploadProgress | Markus Goetz | 2009-10-06 | 3 | -0/+143 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a currently failing testcase. Related to task 261806 and others. Reviewed-by: Peter Hartmann | ||||
| | | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6 | ninerider | 2009-10-06 | 14 | -24/+657 |
| | | |\ \ |