summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* The root object is always last default objectAaron Kennedy2009-10-123-1/+53
| | | | Fix for QT-2301
* Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-10-1233-340/+537
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Add missing files.Michael Brasser2009-10-122-0/+145
| |
| * Correctly identify signal handlers in PropertyChanges when !isScript.Michael Brasser2009-10-111-9/+10
| |
| * Make sure ParentChange always saves original parent.Michael Brasser2009-10-111-3/+1
| |
| * Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-10-1129-428/+497
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * Fix buildThierry Bastian2009-10-091-1/+1
| | |
| * | Improve Behavior reliability.Michael Brasser2009-10-1128-327/+380
| | |
* | | Add id aliasesAaron Kennedy2009-10-095-20/+82
| |/ |/|
* | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-10-093-174/+168
|\ \ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * \ Merge branch 'kinetic-declarativeui' of ↵Yann Bodson2009-10-091-2/+2
| |\ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | Do not use 'resources:' in examplesYann Bodson2009-10-093-174/+168
| | | |
* | | | Support aliases to enum propertiesAaron Kennedy2009-10-094-2/+29
| |/ / |/| |
* | | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-10-091-37/+15
|\ \ \ | |/ / | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | Merge branch 'kinetic-declarativeui' of ↵Yann Bodson2009-10-097-50/+119
| |\ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | fixes gridview.qmlYann Bodson2009-10-091-37/+15
| | | | | | | | | | | | | | | | Task-number: QT-2271
* | | | Fix snow demoAaron Kennedy2009-10-091-2/+2
| |/ / |/| |
* | | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-10-093-117/+61
|\ \ \ | |/ / | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | Fixes yahoonews.qmlYann Bodson2009-10-091-86/+60
| | | | | | | | | | | | Task-number: QT-2281
| * | Remove deprecated write to signal property supportYann Bodson2009-10-092-31/+1
| | |
* | | Tweak scope ordering (again)Aaron Kennedy2009-10-097-50/+119
|/ / | | | | | | | | | | 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 Kennedy2009-10-0938-606/+373
|\ \ | |/ | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-10-09117-2278/+5409
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * Merge branch 'kinetic-declarativeui' of ↵Yann Bodson2009-10-09110-2264/+5389
| | |\ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * Merge branch 'kinetic-declarativeui' of ↵Bea Lam2009-10-0993-1755/+5166
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: examples/declarative/layouts/Button.qml
| | | | * Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-10-0988-1656/+5063
| | | | |\ | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | | * | Remove some warnings.Martin Jones2009-10-091-12/+12
| | | | | |
| | | * | | Merge branch 'kinetic-declarativeui' of ↵Bea Lam2009-10-09114-1684/+2595
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * | | | Remove redundant support/ files.Bea Lam2009-10-085-446/+0
| | | | | | |
| | | * | | | Add command line options.Bea Lam2009-10-081-6/+43
| | | | | | |
| | | * | | | Clean upBea Lam2009-10-088-98/+277
| | | | | | |
| | | * | | | Remove redundant QFxItem::activeFocusChanged(); is not used anywhere,Bea Lam2009-10-076-24/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | presumedly replaced by QFxItem::focusChanged().
| | * | | | | Add missing NOTIFYYann Bodson2009-10-099-14/+20
| | | | | | |
| * | | | | | Improve qdoc generated QML documentation.Michael Brasser2009-10-098-11/+34
| |/ / / / /
* | | | | | Output file/line for script errorsAaron Kennedy2009-10-0914-45/+102
| |_|_|_|/ |/| | | |
* | | | | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-10-094-72/+89
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui-scriptopt
| * | | | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-10-092-45/+82
| |\ \ \ \ | | |/ / / | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | GraphicsObjectContainer cleanup.Michael Brasser2009-10-092-45/+82
| | | |/ | | |/| | | | | | | | | | | | | Also fixes initial size of widget if the container has an explicit size set.
| * | | No need for temporary currentItemMartin Jones2009-10-092-27/+7
| |/ /
* | | Fix example errorsAaron Kennedy2009-10-093-7/+5
| | |
* | | Move Q_PROPERTY()'s to top of objectAaron Kennedy2009-10-082-5/+5
| | | | | | | | | | | | | | | Q_PROPERTY() macros without a semicolon inside a class access block (public:) confuses moc into ignoring Q_INVOKABLES
* | | Incorrect use of Script {}Aaron Kennedy2009-10-083-34/+31
| | |
* | | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-10-0860-250/+1356
|\ \ \ | |/ / | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui-scriptopt
| * | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-10-0860-534/+1558
| |\ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * \ Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-10-0826-75/+1025
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: doc/src/declarative/advtutorial4.qdoc
| | | * | make examples compileYann Bodson2009-10-082-2/+2
| | | | |
| | | * | Merge branch 'kinetic-declarativeui' of ↵Yann Bodson2009-10-0814-322/+248
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: doc/src/declarative/advtutorial1.qdoc doc/src/declarative/advtutorial3.qdoc doc/src/declarative/advtutorial4.qdoc
| | | * | | doc cleanupYann Bodson2009-10-0824-74/+1023
| | | | | |
| | * | | | Update list of testsWarwick Allison2009-10-081-8/+16
| | | | | |
| | * | | | FixWarwick Allison2009-10-081-1/+1
| | | | | |