Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'kinetic-declarativeui' of ↵ | Yann Bodson | 2009-10-09 | 1 | -2/+2 |
|\ | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-10-09 | 1 | -37/+15 |
| |\ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | Fix snow demo | Aaron Kennedy | 2009-10-09 | 1 | -2/+2 |
| | | | |||||
* | | | Do not use 'resources:' in examples | Yann Bodson | 2009-10-09 | 3 | -174/+168 |
| |/ |/| | |||||
* | | Merge branch 'kinetic-declarativeui' of ↵ | Yann Bodson | 2009-10-09 | 7 | -50/+119 |
|\ \ | |/ | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-10-09 | 3 | -117/+61 |
| |\ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | Tweak scope ordering (again) | Aaron Kennedy | 2009-10-09 | 7 | -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. | ||||
* | | | fixes gridview.qml | Yann Bodson | 2009-10-09 | 1 | -37/+15 |
| |/ |/| | | | | | Task-number: QT-2271 | ||||
* | | Fixes yahoonews.qml | Yann Bodson | 2009-10-09 | 1 | -86/+60 |
| | | | | | | | | Task-number: QT-2281 | ||||
* | | Remove deprecated write to signal property support | Yann Bodson | 2009-10-09 | 2 | -31/+1 |
|/ | |||||
* | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-10-09 | 38 | -606/+373 |
|\ | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | Merge branch 'kinetic-declarativeui' of ↵ | Michael Brasser | 2009-10-09 | 117 | -2278/+5409 |
| |\ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | Merge branch 'kinetic-declarativeui' of ↵ | Yann Bodson | 2009-10-09 | 110 | -2264/+5389 |
| | |\ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | | * | Merge branch 'kinetic-declarativeui' of ↵ | Bea Lam | 2009-10-09 | 93 | -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 Jones | 2009-10-09 | 88 | -1656/+5063 |
| | | | |\ | | | | | | | | | | | | | | | | | | | 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 | 114 | -1684/+2595 |
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | | * | | | | Remove redundant support/ files. | Bea Lam | 2009-10-08 | 5 | -446/+0 |
| | | | | | | | |||||
| | | * | | | | Add command line options. | Bea Lam | 2009-10-08 | 1 | -6/+43 |
| | | | | | | | |||||
| | | * | | | | Clean up | Bea Lam | 2009-10-08 | 8 | -98/+277 |
| | | | | | | | |||||
| | | * | | | | Remove redundant QFxItem::activeFocusChanged(); is not used anywhere, | Bea Lam | 2009-10-07 | 6 | -24/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | presumedly replaced by QFxItem::focusChanged(). | ||||
| | * | | | | | Add missing NOTIFY | Yann Bodson | 2009-10-09 | 9 | -14/+20 |
| | | | | | | | |||||
| * | | | | | | Improve qdoc generated QML documentation. | Michael Brasser | 2009-10-09 | 8 | -11/+34 |
| |/ / / / / | |||||
* | | | | | | Output file/line for script errors | Aaron Kennedy | 2009-10-09 | 14 | -45/+102 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | 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 |
| |/ / | |||||
* | | | Fix example errors | Aaron Kennedy | 2009-10-09 | 3 | -7/+5 |
| | | | |||||
* | | | 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 | ||||
* | | | Incorrect use of Script {} | Aaron Kennedy | 2009-10-08 | 3 | -34/+31 |
| | | | |||||
* | | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-10-08 | 60 | -250/+1356 |
|\ \ \ | |/ / | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui-scriptopt | ||||
| * | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-10-08 | 60 | -534/+1558 |
| |\ \ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * \ | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-10-08 | 26 | -75/+1025 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: doc/src/declarative/advtutorial4.qdoc | ||||
| | | * | | make examples compile | Yann Bodson | 2009-10-08 | 2 | -2/+2 |
| | | | | | |||||
| | | * | | Merge branch 'kinetic-declarativeui' of ↵ | Yann Bodson | 2009-10-08 | 14 | -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 cleanup | Yann Bodson | 2009-10-08 | 24 | -74/+1023 |
| | | | | | | |||||
| | * | | | | 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 |
| | | | | | | |||||
| | * | | | | Add url() for setUrl(). | Warwick Allison | 2009-10-08 | 2 | -0/+11 |
| | | | | | | |||||
| | * | | | | spel | Warwick Allison | 2009-10-08 | 1 | -2/+2 |
| | | | | | | |||||
| | * | | | | WebView auto sizing test. | Warwick Allison | 2009-10-08 | 3 | -0/+143 |
| | | |/ / | | |/| | | | | | | | | | | | | (image is just for doc, not in testscript) | ||||
| | * | | | Fix (properly) test image saving. | Warwick Allison | 2009-10-08 | 1 | -2/+3 |
| | | | | | |||||
| * | | | | Remove a bunch of unneeded semicolons. | Martin Jones | 2009-10-08 | 13 | -37/+40 |
| | | | | |