Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'kinetic-declarativeui' of ↵ | Alan Alpert | 2009-07-16 | 50 | -669/+654 |
|\ | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | Add a QmlError::toString() method | Aaron Kennedy | 2009-07-16 | 2 | -12/+19 |
| | | |||||
| * | Mark properties as FINAL | Aaron Kennedy | 2009-07-16 | 1 | -19/+19 |
| | | |||||
| * | Protect against overriding FINAL properties | Aaron Kennedy | 2009-07-16 | 9 | -9/+22 |
| | | |||||
| * | Move the QML rewriting stuff into a central location | Aaron Kennedy | 2009-07-16 | 5 | -140/+266 |
| | | |||||
| * | Remove unnecessary global context management stuff | Aaron Kennedy | 2009-07-16 | 8 | -210/+16 |
| | | |||||
| * | Types should not modify the active context | Aaron Kennedy | 2009-07-16 | 2 | -32/+2 |
| | | |||||
| * | Small cleanups | Aaron Kennedy | 2009-07-16 | 12 | -157/+179 |
| | | |||||
| * | Indenting fix | Aaron Kennedy | 2009-07-16 | 1 | -1/+1 |
| | | |||||
| * | Remove some unreliable binary expression support | Aaron Kennedy | 2009-07-16 | 1 | -63/+1 |
| | | |||||
| * | Add FINAL attribute to Q_PROPERTY() | Aaron Kennedy | 2009-07-16 | 8 | -4/+50 |
| | | | | | | | | This will be used by the declarative module to optimize property bindings. | ||||
| * | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-07-16 | 8 | -18/+65 |
| |\ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | Merge branch 'kinetic-declarativeui' of ↵ | Yann Bodson | 2009-07-16 | 18 | -1832/+3842 |
| | |\ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | Improve loader example | Yann Bodson | 2009-07-16 | 5 | -17/+49 |
| | | | | | | | | | | | | | | | | Use system palette and icons. | ||||
| | * | | Add QmlPalette::darker() and QmlPalette::lighter(). | Yann Bodson | 2009-07-16 | 2 | -0/+13 |
| | | | | |||||
| | * | | Do not segfault when index == -1. | Yann Bodson | 2009-07-16 | 1 | -1/+3 |
| | | | | |||||
| * | | | Fix crash on object destruction | Aaron Kennedy | 2009-07-16 | 2 | -5/+15 |
| | |/ | |/| | |||||
* | | | SameGame notifies player of game over | Alan Alpert | 2009-07-16 | 3 | -7/+29 |
| | | | | | | | | | | | | As requested by Aaron. | ||||
* | | | Updates to the SameGame demo | Alan Alpert | 2009-07-16 | 4 | -10/+9 |
| | | | | | | | | | | | | | | | Tiles now fall down from the top, instead of the corner, and a bit of clean up. | ||||
* | | | Fix a bug in QmlFollow | Alan Alpert | 2009-07-16 | 1 | -0/+1 |
|/ / | | | | | | | Using a follow by turning it on and off at times was not working right. | ||||
* | | Update SameGame particles | Alan Alpert | 2009-07-16 | 4 | -3/+20 |
| | | | | | | | | Remove count:1 hack, make particles the right color. | ||||
* | | Fixes bugs with particles | Alan Alpert | 2009-07-16 | 1 | -4/+7 |
| | | | | | | | | | | Fixed: Particle count changes had a noticable delay Fixed: Changing from zero to non-zero didn't work | ||||
* | | Initial commit of QFxLineEdit | Alan Alpert | 2009-07-16 | 4 | -0/+845 |
| | | | | | | | | QLineControl is integrated here, so no more need for qfxlineedit branch | ||||
* | | Merge branch 'master' of /home/alpert/depot/personal/aalperts-qlinecontrol ↵ | Alan Alpert | 2009-07-16 | 9 | -1825/+2970 |
|\ \ | |/ |/| | | | into kinetic-declarativeui | ||||
| * | Remove emitingEditingFinished from QLineControl | Alan Alpert | 2009-07-16 | 3 | -20/+5 |
| | | | | | | | | Doesn't seem to hurt anything, and it was ugly API. | ||||
| * | Rename the p_foo() functions in QLineControl to internalFoo(). | Marius Bugge Monsen | 2009-07-14 | 2 | -31/+31 |
| | | |||||
| * | Make the member variable names in QLineControl consistent. | Marius Bugge Monsen | 2009-07-14 | 4 | -245/+253 |
| | | |||||
| * | Some minor style and whitespace fixes. | Marius Bugge Monsen | 2009-07-14 | 2 | -38/+44 |
| | | |||||
| * | Add '\internal' to the QLineControl documentation. | Marius Bugge Monsen | 2009-07-14 | 1 | -40/+102 |
| | | |||||
| * | Cleanup some incorrect changes to QLineEdit | Alan Alpert | 2009-07-14 | 1 | -9/+8 |
| | | |||||
| * | qlinecontrol_p_p.h isn't actually used at all, remove file. | Alan Alpert | 2009-07-14 | 1 | -105/+0 |
| | | |||||
| * | Replace Q_ASSERT with qWarning | Alan Alpert | 2009-07-14 | 1 | -2/+4 |
| | | | | | | | | This is probably more correct, but is also the way it used to behave. | ||||
| * | Actually, some of that can't be moved back into QLineEdit | Alan Alpert | 2009-07-14 | 2 | -38/+43 |
| | | | | | | | | | | Also it should be executed a little later to avoid accidental behaviour changes. | ||||
| * | Move some keypad navigation code back out of QLineControl | Alan Alpert | 2009-07-14 | 2 | -50/+48 |
| | | |||||
| * | Fix some minor mistakes | Alan Alpert | 2009-07-10 | 2 | -4/+4 |
| | | |||||
| * | Accidental Behavioural changes have been identified and rectified. | Alan Alpert | 2009-07-08 | 1 | -4/+11 |
| | | | | | | | | | | | | createStandardContextMenu should still only cut/copy in normal echo mode and the Qt3Support function validateAndSet will again only set if it is validated. | ||||
| * | Fixed one of the QT3_SUPPORT constructors. | Alan Alpert | 2009-07-08 | 1 | -8/+3 |
| | | | | | | | | | | It was accidentally left commented out instead of working with QLineControl. | ||||
| * | Forgot to bring in the change to QAbstractSpinBox | Alan Alpert | 2009-07-07 | 2 | -3/+3 |
| | | | | | | | | | | | | QAbstractSpinBox had some code using QLineEdit internals, this had to be move to use QLineControl as well. This commit also includes fixing some typos in my last commit. | ||||
| * | Finish remaining TODOs for QLineControl | Alan Alpert | 2009-07-07 | 3 | -11/+23 |
| | | | | | | | | | | Didn't notice there were still some TODO markers left. They have now all been done. | ||||
| * | Manually integrate 099a32d121 to QLineControl | Alan Alpert | 2009-07-07 | 1 | -1/+2 |
| | | | | | | | | | | This change to QLineEdit didn't merge, as it needs to be applied to QLineControl in this case. | ||||
| * | Manual cherrypick of QLineControl from kinetic-declarativeui-qfxlineedit | Alan Alpert | 2009-07-07 | 9 | -1840/+3010 |
| | | | | | | | | | | | | | | | | | | | | Splits out the control logic of QLineEdit into QLineControl, which is somewhat similar to QTextEdit. This was originally worked on in the ianws-qt-lineedit-textedit-research repository, and then further developed in kinetic in the kinetic-declarativeui-qfxlineedit branch. Note that this also includes a tiny change to qvalidator.h which allows validators to be used in qml. | ||||
* | | Rewrite QML expressions as closures | Roberto Raggi | 2009-07-15 | 2 | -34/+143 |
| | | |||||
* | | Added support for parsing toplevel expressions and statements. | Roberto Raggi | 2009-07-15 | 5 | -1903/+1098 |
| | | |||||
* | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-07-15 | 4 | -53/+80 |
|\ \ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * \ | Merge branch 'kinetic-declarativeui' of ↵ | Alan Alpert | 2009-07-15 | 53 | -1050/+1467 |
| |\ \ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | Restyle SameGame demo based on feedback | Alan Alpert | 2009-07-15 | 4 | -53/+80 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Uses a more familar rule set -Default theme swapped -Sizing altered. Now the tiles are 40x40 so as to be able to be pretty and have shiny animations, board size is set by what can fit in the game canvas. | ||||
* | | | | Remove pointless QmlCompiledComponent class | Aaron Kennedy | 2009-07-15 | 19 | -245/+66 |
| |/ / |/| | | |||||
* | | | Missing file | Aaron Kennedy | 2009-07-15 | 1 | -0/+211 |
| | | | |||||
* | | | Revert "Use a function object when evaluating bindings" | Aaron Kennedy | 2009-07-15 | 2 | -17/+5 |
| | | | | | | | | | | | | | | | | | | Turns out this simple approach doesn't work. Fortunately we have a volunteer to do it properly. This reverts commit 958dc50e2b0fe2e875a704554438be75907ed3c5. | ||||
* | | | Fix memory leak | Aaron Kennedy | 2009-07-15 | 1 | -0/+4 |
| | | |