Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'kinetic-declarativeui' of ↵ | Alan Alpert | 2009-09-14 | 47 | -304/+512 |
|\ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/fx/qfxtext.cpp | ||||
| * | Don't crash. | Warwick Allison | 2009-09-14 | 1 | -1/+6 |
| | | | | | | | | | | The engine tree shouldn't have all these objects in it, but for now, just prevent crash when there are signals with parameters. | ||||
| * | Move XmlListModelRole to be properly private. | Warwick Allison | 2009-09-14 | 2 | -80/+86 |
| | | |||||
| * | Track QML API changes. | Warwick Allison | 2009-09-14 | 1 | -3/+3 |
| | | |||||
| * | Fixed UrlBar to not clip off top 3 pixels of the page | Nigel Hietala | 2009-09-12 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-09-11 | 9 | -42/+49 |
| |\ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | Merge branch 'kinetic-declarativeui' of ↵ | Michael Brasser | 2009-09-11 | 11 | -40/+87 |
| | |\ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | | * | Fix moving an item to the first visible position. | Martin Jones | 2009-09-11 | 2 | -19/+19 |
| | | | | | | | | | | | | | | | | Also fix the type of some properties/variables. | ||||
| | | * | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-09-11 | 4 | -33/+44 |
| | | |\ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | | * | | Avoid spurious flicks due to quick clicking motions. | Martin Jones | 2009-09-11 | 1 | -10/+20 |
| | | | | | |||||
| | | * | | current -> currentItem property in ListView and GridView | Martin Jones | 2009-09-11 | 7 | -8/+10 |
| | | | | | |||||
| | * | | | Don't need to save and restore painter for tiling. | Michael Brasser | 2009-09-11 | 1 | -5/+0 |
| | | | | | |||||
| * | | | | Fix that empty string "resolves" to empty URL. | Warwick Allison | 2009-09-11 | 1 | -4/+3 |
| | | | | | | | | | | | | | | | | | | | | Fix typo. | ||||
| * | | | | Ensure text size changes when text is made empty, or elides to empty. | Warwick Allison | 2009-09-11 | 2 | -13/+12 |
| | |_|/ | |/| | | | | | | | | | | | | | | Previously, old size would persist if text changed from non-"" to "". Elide text in example (tests and demonstrates) | ||||
| * | | | Ensure item moves are passed on literally so views can animate literally. | Warwick Allison | 2009-09-11 | 1 | -1/+4 |
| | | | | |||||
| * | | | tweak | Warwick Allison | 2009-09-11 | 2 | -2/+34 |
| |/ / | |||||
| * | | Merge branch 'kinetic-declarativeui' of ↵ | Michael Brasser | 2009-09-11 | 5 | -26/+137 |
| |\ \ | | |/ | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | Handle itemsMoved() in GridView. | Martin Jones | 2009-09-11 | 2 | -0/+64 |
| | | | |||||
| | * | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-09-10 | 13 | -14/+16 |
| | |\ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | Implement itemsMoved() in ListView. | Martin Jones | 2009-09-10 | 3 | -26/+73 |
| | | | | | | | | | | | | | | | | No animation possible currently. | ||||
| * | | | Use drawTiledPixmap for tiling. | Michael Brasser | 2009-09-11 | 1 | -30/+6 |
| | |/ | |/| | | | | | | | So we can take advantage of backend optimizations. | ||||
| * | | Fixed references to QFxPainted, which got replaced by QFxPaintedItem | Thorbjørn Lindeijer | 2009-09-10 | 2 | -3/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | See commit 415708f85341448c6f30bbca6e31e48dbfde72a5, and later renaming of QFxImageItem to QFxPaintedItem in commit d1bb572b9fb5b0286df992c8ae560d91c9dc3388. Also added a table of contents to the QML for C++ Programmers page. | ||||
| * | | Remove unused imports from examples for extending. | Christian Kamm | 2009-09-10 | 10 | -10/+0 |
| | | | | | | | | | | | | Reviewed-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com> | ||||
| * | | Fix QML_DEFINE_EXTENDED_TYPE use in extending/extended example. | Christian Kamm | 2009-09-10 | 1 | -1/+1 |
| | | | | | | | | | | | | Reviewed-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com> | ||||
| * | | Fix extending examples by inserting the appropriate import. | Christian Kamm | 2009-09-10 | 10 | -0/+10 |
| |/ | | | | | | | | | Reviewed-by: owolff Reviewed-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com> | ||||
| * | Best to delete pointer before zeroing it. | Martin Jones | 2009-09-10 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-09-10 | 11 | -62/+154 |
| |\ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | Follow renamed to SpringFollow. | Martin Jones | 2009-09-10 | 19 | -115/+180 |
| | | | |||||
* | | | Text now has one line of implicit height when it has zero lines of text | Alan Alpert | 2009-09-10 | 2 | -3/+4 |
| |/ |/| | | | | | Task-number: 255266 | ||||
* | | Merge branch 'kinetic-declarativeui' of ↵ | Alan Alpert | 2009-09-10 | 12 | -38/+120 |
|\ \ | |/ | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-09-10 | 9 | -31/+92 |
| |\ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-09-10 | 9 | -8/+406 |
| | |\ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | Report custom parse errors verbosely. | Warwick Allison | 2009-09-10 | 9 | -31/+92 |
| | | | | |||||
| * | | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-09-10 | 3 | -7/+294 |
| |\ \ \ | | | |/ | | |/| | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | Merge branch 'kinetic-declarativeui' of ↵ | Yann Bodson | 2009-09-10 | 11 | -63/+539 |
| | |\ \ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | | typo | Yann Bodson | 2009-09-10 | 1 | -3/+3 |
| | | | | | |||||
| * | | | | Support URL resolution from within script blocks | Aaron Kennedy | 2009-09-10 | 2 | -4/+25 |
| | | | | | |||||
* | | | | | Cursory QFxTextInput documentation. | Alan Alpert | 2009-09-10 | 1 | -0/+58 |
| | | | | | |||||
* | | | | | Update demos to work with API changes | Alan Alpert | 2009-09-10 | 5 | -6/+7 |
| | | | | | | | | | | | | | | | | | | | | Affected are flickr and twitter. | ||||
* | | | | | API Changes | Alan Alpert | 2009-09-10 | 7 | -56/+89 |
| |_|/ / |/| | | | | | | | | | | | Renaming stuff in TextEdit/Input | ||||
* | | | | Merge branch 'kinetic-declarativeui' of ↵ | Alan Alpert | 2009-09-09 | 9 | -59/+248 |
|\ \ \ \ | |/ / / | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | Autotest for property aliases | Aaron Kennedy | 2009-09-09 | 6 | -1/+112 |
| | |/ | |/| | |||||
| * | | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-09-09 | 24 | -264/+263 |
| |\ \ | | |/ | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-09-09 | 26 | -334/+803 |
| |\ \ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | Don't allow sparse-setting, since not efficient anyway. | Warwick Allison | 2009-09-09 | 1 | -22/+16 |
| | | | | |||||
| * | | | clearer example | Warwick Allison | 2009-09-09 | 1 | -4/+12 |
| | | | | |||||
| * | | | Fix destruction of ModelNodes (fix crash-on-exit). | Warwick Allison | 2009-09-09 | 1 | -7/+6 |
| | | | | |||||
| * | | | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-09-09 | 142 | -1950/+2266 |
| |\ \ \ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | | Modifying ListModel from JS: work for structured data too. | Warwick Allison | 2009-09-09 | 3 | -27/+104 |
| | | | | | |||||
* | | | | | Start on QFxTextInput autotests | Alan Alpert | 2009-09-09 | 2 | -4/+291 |
| |_|_|/ |/| | | | | | | | | | | | Actually has tests in it now. Not all implemented yet though. |