Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Use utf8 instead of latin1 where appropriate | Aaron Kennedy | 2009-10-12 | 22 | -66/+65 |
| | |||||
* | The root object is always last default object | Aaron Kennedy | 2009-10-12 | 1 | -1/+5 |
| | | | | Fix for QT-2301 | ||||
* | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-10-12 | 32 | -339/+533 |
|\ | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | Add missing files. | Michael Brasser | 2009-10-12 | 2 | -0/+145 |
| | | |||||
| * | Correctly identify signal handlers in PropertyChanges when !isScript. | Michael Brasser | 2009-10-11 | 1 | -9/+10 |
| | | |||||
| * | Make sure ParentChange always saves original parent. | Michael Brasser | 2009-10-11 | 1 | -3/+1 |
| | | |||||
| * | Merge branch 'kinetic-declarativeui' of ↵ | Michael Brasser | 2009-10-11 | 16 | -116/+126 |
| |\ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | Fix build | Thierry Bastian | 2009-10-09 | 1 | -1/+1 |
| | | | |||||
| * | | Improve Behavior reliability. | Michael Brasser | 2009-10-11 | 27 | -326/+376 |
| | | | |||||
* | | | Add id aliases | Aaron Kennedy | 2009-10-09 | 2 | -17/+42 |
| |/ |/| | |||||
* | | Support aliases to enum properties | Aaron Kennedy | 2009-10-09 | 1 | -2/+5 |
| | | |||||
* | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-10-09 | 2 | -31/+1 |
|\ \ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | Remove deprecated write to signal property support | Yann Bodson | 2009-10-09 | 2 | -31/+1 |
| | | | |||||
* | | | Tweak scope ordering (again) | Aaron Kennedy | 2009-10-09 | 5 | -37/+49 |
|/ / | | | | | | | | | | | 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. | ||||
* | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-10-09 | 12 | -44/+32 |
|\ \ | |/ | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | Merge branch 'kinetic-declarativeui' of ↵ | Yann Bodson | 2009-10-09 | 56 | -1618/+3638 |
| |\ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | Merge branch 'kinetic-declarativeui' of ↵ | Bea Lam | 2009-10-09 | 55 | -1644/+3719 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: examples/declarative/layouts/Button.qml | ||||
| | | * | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-10-09 | 50 | -1560/+3618 |
| | | |\ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | | * | | Remove some warnings. | Martin Jones | 2009-10-09 | 1 | -12/+12 |
| | | | | | |||||
| | * | | | Merge branch 'kinetic-declarativeui' of ↵ | Bea Lam | 2009-10-09 | 22 | -107/+138 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | | | Remove redundant QFxItem::activeFocusChanged(); is not used anywhere, | Bea Lam | 2009-10-07 | 3 | -19/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | presumedly replaced by QFxItem::focusChanged(). | ||||
| * | | | | | Add missing NOTIFY | Yann Bodson | 2009-10-09 | 8 | -13/+19 |
| | | | | | | |||||
* | | | | | | Output file/line for script errors | Aaron Kennedy | 2009-10-09 | 11 | -45/+70 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-10-09 | 4 | -72/+89 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui-scriptopt | ||||
| * | | | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-10-09 | 2 | -45/+82 |
| |\ \ \ \ | | |/ / / | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | | GraphicsObjectContainer cleanup. | Michael Brasser | 2009-10-09 | 2 | -45/+82 |
| | | |/ | | |/| | | | | | | | | | | | | | Also fixes initial size of widget if the container has an explicit size set. | ||||
| * | | | No need for temporary currentItem | Martin Jones | 2009-10-09 | 2 | -27/+7 |
| |/ / | |||||
* | | | Move Q_PROPERTY()'s to top of object | Aaron Kennedy | 2009-10-08 | 2 | -5/+5 |
| | | | | | | | | | | | | | | | Q_PROPERTY() macros without a semicolon inside a class access block (public:) confuses moc into ignoring Q_INVOKABLES | ||||
* | | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-10-08 | 14 | -37/+48 |
|\ \ \ | |/ / | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui-scriptopt | ||||
| * | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-10-08 | 6 | -12/+24 |
| |\ \ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | Add url() for setUrl(). | Warwick Allison | 2009-10-08 | 2 | -0/+11 |
| | | | | |||||
| * | | | Remove a bunch of unneeded semicolons. | Martin Jones | 2009-10-08 | 12 | -37/+37 |
| | | | | |||||
* | | | | Fix visual model crash at shutdown due to dangling pointer | Aaron Kennedy | 2009-10-08 | 1 | -30/+46 |
| | | | | |||||
* | | | | Small optimization | Aaron Kennedy | 2009-10-08 | 1 | -3/+4 |
| | | | | |||||
* | | | | Zero bindingBits correctly | Aaron Kennedy | 2009-10-08 | 1 | -2/+3 |
| | | | | |||||
* | | | | Fix crash | Aaron Kennedy | 2009-10-08 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-10-08 | 8 | -70/+90 |
|\ \ \ \ | | |/ / | |/| | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui-scriptopt | ||||
| * | | | Merge branch 'kinetic-declarativeui' of ↵ | Alan Alpert | 2009-10-08 | 2 | -22/+32 |
| |\ \ \ | | |/ / | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-10-08 | 2 | -36/+45 |
| | |\ \ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * \ \ | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-10-07 | 3 | -489/+0 |
| | |\ \ \ | | | | |/ | | | |/| | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-10-06 | 4 | -34/+70 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | | | Auto tests for QmlTimer | Martin Jones | 2009-10-06 | 2 | -22/+32 |
| | | | | | | |||||
| * | | | | | Rename preserveSelection to persistentSelection | Alan Alpert | 2009-10-08 | 4 | -12/+13 |
| | |_|_|/ | |/| | | | | | | | | | | | | | Task-number: QT-1113 | ||||
| * | | | | Fix QFxTextInput | Alan Alpert | 2009-10-07 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | It was accepting input on both press and release, for some reason | ||||
| * | | | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-10-07 | 3 | -489/+0 |
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | | Compile on Symbian. | Martin Jones | 2009-10-07 | 1 | -36/+44 |
| | |_|/ | |/| | | |||||
* | | | | Use correct file case | Aaron Kennedy | 2009-10-08 | 1 | -3/+3 |
| | | | | |||||
* | | | | Update to use new QScriptDeclarativeClass API | Aaron Kennedy | 2009-10-08 | 1 | -2/+2 |
| | | | | |||||
* | | | | Make qmlecmascript:selfDeletingBinding pass | Aaron Kennedy | 2009-10-08 | 4 | -133/+182 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expressions and bindings must not reference data following their evalutation incase their object has been deleted. To solve this, the needed data is separated into a reference counted QmlExpressionData and QmlBindingData object. | ||||
* | | | | Remove bogus assert | Aaron Kennedy | 2009-10-07 | 1 | -1/+0 |
| | | | |