Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'kinetic-declarativeui' of ↵ | Martin Smith | 2009-05-11 | 26 | -1106/+1390 |
|\ | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | Merge branch 'kinetic-declarativeui' of ↵ | Erik Verbruggen | 2009-05-11 | 5 | -873/+853 |
| |\ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | Fixed the conflicts introduced by UiArrayLiteral | Roberto Raggi | 2009-05-11 | 5 | -873/+853 |
| | | | |||||
| * | | Added positioning information to the dom as position+length. | Erik Verbruggen | 2009-05-11 | 4 | -0/+91 |
| |/ | | | | | | | Reviewed-by: Roberto Raggi | ||||
| * | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-05-11 | 1 | -5/+16 |
| |\ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | localfile optimization for Script elements | Warwick Allison | 2009-05-11 | 1 | -5/+16 |
| | | | |||||
| * | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-05-11 | 10 | -158/+301 |
| |\ \ | | |/ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: tests/auto/declarative/qmlbindengine/tst_qmlbindengine.cpp | ||||
| | * | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-05-11 | 27 | -364/+749 |
| | |\ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | | * | Add support for removing anchors. | Michael Brasser | 2009-05-11 | 3 | -141/+237 |
| | | | | | | | | | | | | | | | | | | | | This makes it possible to remove an anchor that was previously set. Trying to set a new anchor after one was removed isn't working yet. | ||||
| | * | | Fix double-click AND flicking. | Warwick Allison | 2009-05-11 | 2 | -1/+4 |
| | | | | | | | | | | | | | | | | Re-do of dae02071a9e985b3ea847f08af6849ff2daad3c3 | ||||
| | * | | Fix MouseRegion.enabled | Warwick Allison | 2009-05-11 | 1 | -11/+22 |
| | | | | | | | | | | | | | | | | | | | | All Qt events are accepted by default. Must be specifically ignored. Normally, this is done by calling base class in the "ignore" case. | ||||
| | * | | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-05-11 | 7 | -61/+54 |
| | |\ \ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * \ \ | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-05-10 | 15 | -53/+545 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * \ \ \ | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-05-08 | 121 | -3401/+3375 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | | | | Remove non-working scale-to-width code. | Warwick Allison | 2009-05-08 | 1 | -5/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This does not belong here. Zooming can be done by parent. Also, it doesn't work. (was previously also removed from QFxWebView) | ||||
| | * | | | | | highlight color property | Warwick Allison | 2009-05-08 | 3 | -0/+35 |
| | | | | | | | |||||
| * | | | | | | Reevaluate expressions when context properties change | Aaron Kennedy | 2009-05-11 | 6 | -70/+129 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | qdoc: Fixed some qdoc errors. | Martin Smith | 2009-05-11 | 3 | -13/+20 |
|/ / / / / | |||||
* | | | | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-05-11 | 12 | -236/+321 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * \ \ \ \ | Merge branch 'kinetic-declarativeui' of ↵ | Michael Brasser | 2009-05-11 | 11 | -73/+160 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * \ \ \ \ | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-05-11 | 2 | -0/+2 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | | * \ \ \ \ | Merge branch 'kinetic-declarativeui' of ↵ | Yann Bodson | 2009-05-11 | 1 | -0/+1 |
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | | * | | | | | | Compile | Yann Bodson | 2009-05-11 | 1 | -0/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | d-pointerize QmlOpenMetaObject | Martin Jones | 2009-05-11 | 4 | -61/+78 |
| | | | | | | | | | |||||
| | * | | | | | | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-05-11 | 17 | -39/+239 |
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | | | | | | Lower case role names are needed. | Martin Jones | 2009-05-11 | 1 | -6/+7 |
| | | | | | | | | | |||||
| * | | | | | | | | Remove debug. | Michael Brasser | 2009-05-11 | 1 | -2/+0 |
| | | | | | | | | | |||||
| * | | | | | | | | Apply a states binding changes even if there is no transition. | Michael Brasser | 2009-05-11 | 2 | -6/+12 |
| | | | | | | | | | |||||
| * | | | | | | | | Detect binding loops. | Michael Brasser | 2009-05-11 | 2 | -88/+98 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't crash when a looping binding has been established. Instead, print a warning and stop looping. | ||||
| * | | | | | | | | Merge branch 'kinetic-declarativeui' of ↵ | Michael Brasser | 2009-05-11 | 14 | -56/+166 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | | | | | | | Add simple loop detection to anchoring system. | Michael Brasser | 2009-05-11 | 2 | -73/+125 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Fix crash | Aaron Kennedy | 2009-05-11 | 1 | -0/+3 |
| |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Component {} would crash the compiler. | ||||
* | | | | | | | | | Update repaint region when removing items | Aaron Kennedy | 2009-05-11 | 1 | -0/+1 |
| |_|_|/ / / / / |/| | | | | | | | |||||
* | | | | | | | | Clean up QmlContext's and QmlExpression's when a context gets deleted | Aaron Kennedy | 2009-05-11 | 4 | -3/+49 |
| | | | | | | | | |||||
* | | | | | | | | When a QmlContext is destroyed, associated objects must be disassociated | Aaron Kennedy | 2009-05-11 | 5 | -4/+25 |
| |/ / / / / / |/| | | | | | | |||||
* | | | | | | | Handle QmlParserStatus's and QmlBindableValeus being deleted during ↵ | Aaron Kennedy | 2009-05-11 | 11 | -31/+164 |
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | component creation | ||||
* | | | | | | Compile | Aaron Kennedy | 2009-05-11 | 1 | -2/+2 |
| |/ / / / |/| | | | | |||||
* | | | | | Get QListModelInterface back in line with itemviews_ng. | Martin Jones | 2009-05-10 | 2 | -23/+0 |
|/ / / / | |||||
* | | | | Change QList_int typedef back to QList<int> - broke signal connection. | Martin Jones | 2009-05-10 | 2 | -22/+9 |
| | | | | |||||
* | | | | Make sure we correctly remove the PathView attached property object. | Martin Jones | 2009-05-10 | 2 | -1/+7 |
| | | | | | | | | | | | | | | | | If we don't, we get some nasty random crashes. | ||||
* | | | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-05-10 | 15 | -53/+545 |
|\ \ \ \ | | |_|/ | |/| | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | Merge branch 'kinetic-declarativeui' of ↵ | Roberto Raggi | 2009-05-08 | 2 | -1/+2 |
| |\ \ \ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | | qdoc: Fixed default parameter. | Martin Smith | 2009-05-08 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Smith | 2009-05-08 | 6 | -14/+54 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | | | qdoc: Fixed missing end of comment. | Martin Smith | 2009-05-08 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | Fixed possible crash when processing Ui object definitions. | Roberto Raggi | 2009-05-08 | 1 | -3/+6 |
| | |/ / / | |/| | | | |||||
| * | | | | Expose import statements in QmlDomDocument | Kai Koehne | 2009-05-08 | 6 | -14/+54 |
| |/ / / | | | | | | | | | | | | | | | | | Reviewed-by: erikv Reviewed-by: Roberto Raggi | ||||
| * | | | qdoc: Added qlistmodelinterface.cpp to correct some qdoc warnings. | Martin Smith | 2009-05-08 | 3 | -33/+134 |
| | | | | |||||
| * | | | Add canvas image capture | Aaron Kennedy | 2009-05-08 | 2 | -9/+90 |
| | | | | |||||
| * | | | Add canvas debugger module | Aaron Kennedy | 2009-05-08 | 6 | -3/+269 |
| | |/ | |/| |