Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'kinetic-declarativeui' of ↵ | Alan Alpert | 2009-09-24 | 164 | -2997/+13244 |
|\ | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-09-24 | 144 | -2937/+12821 |
| |\ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-09-24 | 11 | -3/+111 |
| | |\ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | Update visual autotests and visual autotest infrastructure | Aaron Kennedy | 2009-09-24 | 144 | -2937/+12821 |
| | | | | |||||
| * | | | More tests for QmlSql, more WebKit-tested-validity. | Warwick Allison | 2009-09-24 | 7 | -9/+206 |
| | | | | |||||
| * | | | Only same-as-webkit iteration example (QML actually supports more) | Warwick Allison | 2009-09-24 | 1 | -8/+1 |
| | | | | |||||
| * | | | More testing, validate tests before running them. | Warwick Allison | 2009-09-24 | 3 | -28/+97 |
| | | | | | | | | | | | | | | | | Run all WebKit validations first (no point testing QML if the test are wrong). | ||||
| * | | | Tidy JS | Warwick Allison | 2009-09-24 | 1 | -8/+11 |
| | | | | |||||
| * | | | Track changes from qtwebkit-4.6-snapshot-18092009 | Warwick Allison | 2009-09-24 | 2 | -2/+3 |
| | |/ | |/| | | | | | | | Tidy js. | ||||
| * | | Add some visual autotests for QFxTextEdit | Alan Alpert | 2009-09-24 | 10 | -0/+100 |
| | | | | | | | | | | | | | | | Includes test for regression against QT-669 (but it doesn't work just yet) | ||||
* | | | Mark an inefficency in TextEdit | Alan Alpert | 2009-09-24 | 1 | -0/+1 |
| | | | |||||
* | | | Prevent qmlviewer from confusing people when root items are small. | Alan Alpert | 2009-09-24 | 1 | -0/+2 |
|/ / | | | | | | | Task-number: QT-711 | ||||
* | | Enhance QFxPainted item to work when on non-white backgrounds. | Alan Alpert | 2009-09-24 | 1 | -3/+11 |
|/ | | | | | | | Improved version of the fix in 1c011c7f70791e0a4a38bd9f8bb1988cd604305c This fixes the bug with text cursors being an unusally large white rect in the flicker demo. | ||||
* | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-09-24 | 7 | -25/+103 |
|\ | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | Fixed compile (missing colon after public) | Thorbjørn Lindeijer | 2009-09-23 | 1 | -5/+5 |
| | | |||||
| * | Make QmlCompositeTypeData a class instead of a struct | Kai Koehne | 2009-09-23 | 3 | -3/+4 |
| | | | | | | | | | | | | | | | | This fixes a warning of msvc that apparently doesn't like a struct (QmlCompositeTypeData) extending a class (QmlRefCount): "warning C4099: 'QmlCompositeTypeData' : type name first seen using 'class' now seen using 'struct'" | ||||
| * | Merge branch 'kinetic-declarativeui' of ↵ | Bea Lam | 2009-09-23 | 22 | -56/+267 |
| |\ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-09-23 | 170 | -129/+357 |
| | |\ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | Update configure.exe | Aaron Kennedy | 2009-09-23 | 1 | -0/+0 |
| | | | | |||||
| * | | | Allow watching of properties to be stopped from watch table. Also fix | Bea Lam | 2009-09-23 | 3 | -18/+95 |
| | | | | | | | | | | | | | | | | bug where watch removal requests were not sent to the server side. | ||||
* | | | | Fix qmlecmascript::bindingLoop testcase | Aaron Kennedy | 2009-09-23 | 1 | -1/+2 |
| | | | | |||||
* | | | | Only compile time register synthesized objects | Aaron Kennedy | 2009-09-23 | 1 | -5/+3 |
| | | | | |||||
* | | | | Make more qmlecmascript tests pass | Aaron Kennedy | 2009-09-23 | 16 | -38/+334 |
| |_|/ |/| | | | | | | | | | | | Test cases constantsOverrideBindings, outerBindingOverridesInnerBinding and aliasPropertyAndBinding now pass. | ||||
* | | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-09-23 | 4 | -39/+45 |
|\ \ \ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * \ \ | Merge branch 'kinetic-declarativeui' of ↵ | Alan Alpert | 2009-09-23 | 10 | -12/+177 |
| |\ \ \ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | | Repeater is more consistent with its docs | Alan Alpert | 2009-09-23 | 1 | -7/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-2030 Reviewed-by: Yann Bodson | ||||
| * | | | | Merge branch 'kinetic-declarativeui' of ↵ | Alan Alpert | 2009-09-23 | 169 | -249/+1305 |
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | | fix QFxTextInput Autotest | Alan Alpert | 2009-09-23 | 1 | -28/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note that a test based on focus is still failing, presumably due to recent focus changes. Haven't yet investigated if it should be failing or not. | ||||
| * | | | | QFxTextEdit test passes again | Alan Alpert | 2009-09-23 | 2 | -4/+5 |
| | | | | | |||||
* | | | | | Use new property name | Aaron Kennedy | 2009-09-23 | 2 | -4/+4 |
| | | | | | |||||
* | | | | | Fix crash | Aaron Kennedy | 2009-09-23 | 5 | -3/+41 |
| | | | | | |||||
* | | | | | Remove binding when writing to a property | Aaron Kennedy | 2009-09-23 | 2 | -5/+19 |
| |_|/ / |/| | | | |||||
* | | | | Add some failing autotests | Aaron Kennedy | 2009-09-23 | 6 | -0/+126 |
| | | | | |||||
* | | | | Failing autotest for Repeater bug | Aaron Kennedy | 2009-09-23 | 3 | -5/+32 |
| |/ / |/| | | |||||
* | | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-09-23 | 1 | -0/+6 |
|\ \ \ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * \ \ | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-09-23 | 149 | -70/+81 |
| |\ \ \ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * \ \ \ | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-09-23 | 171 | -281/+1467 |
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | | missed file | Warwick Allison | 2009-09-23 | 1 | -0/+6 |
| | | | | | |||||
* | | | | | Off by one bug in binding bit test | Aaron Kennedy | 2009-09-23 | 1 | -3/+3 |
| |_|/ / |/| | | | |||||
* | | | | Rename testcases | Aaron Kennedy | 2009-09-23 | 149 | -70/+81 |
| |/ / |/| | | |||||
* | | | Merge qmlengine and qmlbindengine tests | Aaron Kennedy | 2009-09-23 | 6 | -104/+80 |
| | | | |||||
* | | | Compile | Aaron Kennedy | 2009-09-23 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-09-23 | 10 | -37/+1033 |
|\ \ \ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * \ \ | Merge branch 'kinetic-declarativeui' of ↵ | Bea Lam | 2009-09-23 | 11983 | -93596/+412581 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/qml/qml.pri | ||||
| * | | | | Add some of the functionality from the old debugger (e.g. dynamic updating ↵ | Bea Lam | 2009-09-23 | 10 | -37/+1033 |
| | | | | | | | | | | | | | | | | | | | | of property values, watch table, colouring of tree widget items). | ||||
* | | | | | Use .qml file extension in test | Aaron Kennedy | 2009-09-23 | 12 | -11/+11 |
| | | | | | |||||
* | | | | | Move test data into data/ subdir | Aaron Kennedy | 2009-09-23 | 13 | -1/+1 |
| |/ / / |/| | | | |||||
* | | | | vector -> Qt.vector3d | Aaron Kennedy | 2009-09-23 | 1 | -2/+0 |
| | | | | |||||
* | | | | Move test data into data subdir | Aaron Kennedy | 2009-09-23 | 128 | -3/+3 |
| | | | | |||||
* | | | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-09-23 | 4 | -24/+44 |
|\ \ \ \ | | |_|/ | |/| | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui |