Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-04-29 | 108 | -2182/+2183 |
|\ | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/fx/qfximageitem.cpp src/declarative/fx/qfxpathview.cpp src/declarative/util/qmllistmodel.cpp | ||||
| * | Fix qmlvariantanimation to behave as qmlnumericanimation when 'from' is not set | Leonardo Sobral Cunha | 2009-04-28 | 1 | -1/+4 |
| | | | | | | | | | | The qmlvariantanimation was setting an invalid 'fromValue' when the 'from' property was unspecified. | ||||
| * | Remove trailing whitespaces from qmlanimation* | Leonardo Sobral Cunha | 2009-04-28 | 2 | -15/+14 |
| | | |||||
| * | Coding style refactor, changing 'if(' and 'for(' to 'if (' and 'for (' | Leonardo Sobral Cunha | 2009-04-28 | 103 | -2154/+2154 |
| | | |||||
| * | qdoc: Corrected some qdoc warnings. | Martin Smith | 2009-04-28 | 6 | -10/+9 |
| | | |||||
| * | Merge branch 'kinetic-declarativeui' of ↵ | Martin Smith | 2009-04-28 | 39 | -20/+13652 |
| |\ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | qdoc: Corrected a few qdoc warnings. | Martin Smith | 2009-04-28 | 2 | -5/+5 |
| | | | | | | | | | | | | | | | | | | Changed some qDebug() output in qdoc to be real qdoc waqrnings with location information for the user. These were in the qmlproperty command processing. | ||||
* | | | Some foreach remove/improve. | Martin Jones | 2009-04-28 | 8 | -29/+37 |
| |/ |/| | |||||
* | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-04-28 | 2 | -4/+10 |
|\ \ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | Don't create two atttached property objects per item. | Martin Jones | 2009-04-28 | 2 | -4/+10 |
| | | | |||||
* | | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-04-28 | 1 | -1/+0 |
|\ \ \ | |/ / | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-04-28 | 7 | -298/+710 |
| |\ \ | | |/ | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | Remove debug. | Martin Jones | 2009-04-28 | 1 | -1/+0 |
| | | | |||||
* | | | Merge branch 'kinetic-declarativeui' of ../kinetic into ↵ | Aaron Kennedy | 2009-04-28 | 5 | -297/+699 |
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | kinetic-declarativeui-qfx Conflicts: examples/declarative/minehunt/minehunt.qml | ||||
| * | | Merge branch 'kinetic-declarativeui' of ↵ | Michael Brasser | 2009-04-28 | 51 | -339/+857 |
| |\ \ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | API and documentation work on the transform elements. | Michael Brasser | 2009-04-28 | 5 | -297/+699 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Axis has been split into Axis, AxisRotation, and AxisTranslation. Basic docs (in some cases just a stub) have been added for these, Perspective, and Squish. Flipable has moved to its own file. | ||||
* | | | | Merge branch 'kinetic-declarativeui' of ../kinetic into ↵ | Aaron Kennedy | 2009-04-28 | 26 | -146/+383 |
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | kinetic-declarativeui-qfx Conflicts: examples/declarative/mouseregion/mouse.qml | ||||
| * | | | Delay Repeater item construction until component completion | Aaron Kennedy | 2009-04-28 | 2 | -1/+11 |
| | |/ | |/| | | | | | | | | | | | | | The engine can crash if objects with bindings or parser status's are created and destroyed before a component complete. This works around this limitation, that should ideally be fixed in the engine. | ||||
| * | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-04-28 | 16 | -62/+198 |
| |\ \ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | Use QObject declarative data to store attached properties. | Aaron Kennedy | 2009-04-28 | 16 | -60/+196 |
| | | | | | | | | | | | | | | | | | | | | An element's qmlAttachedProperties() function will now only ever get called once per object. | ||||
| * | | | More mouse and key event handling and related documentation | Martin Jones | 2009-04-28 | 8 | -85/+176 |
| | | | | |||||
* | | | | Introduced Node::firstSourceLocation(), Node::lastSourceLocation(). | Roberto Raggi | 2009-04-27 | 10 | -108/+572 |
| | | | | |||||
* | | | | Merge branch 'kinetic-declarativeui' of ↵ | Roberto Raggi | 2009-04-27 | 13 | -127/+387 |
|\ \ \ \ | | |/ / | |/| | | | | | | git://scm.dev.nokia.troll.no/qt/kinetic into kinetic-declarativeui-qfx | ||||
| * | | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-04-27 | 12 | -125/+385 |
| |\ \ \ | | |/ / | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-04-27 | 59 | -2090/+792 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/fx/qfxitem.cpp | ||||
| | | * | | Fix use of qmlContext() - move outside contructor. | Warwick Allison | 2009-04-27 | 1 | -50/+47 |
| | | | | | |||||
| | * | | | Make MouseRegion signals pass a mouse event as their parameter. | Martin Jones | 2009-04-27 | 8 | -54/+260 |
| | | | | | |||||
| | * | | | Fix warning. | Martin Jones | 2009-04-27 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Add some constructors without QmlContext parameter. | Martin Jones | 2009-04-27 | 2 | -2/+37 |
| | | | | | | | | | | | | | | | | | | | | and mark the existing constructors internal. | ||||
| | * | | | Doc fixes. | Martin Jones | 2009-04-27 | 2 | -28/+49 |
| | | | | | |||||
| * | | | | Don't crash when not using QFxVisualItemModel with PathView | Aaron Kennedy | 2009-04-27 | 1 | -2/+2 |
| | |/ / | |/| | | | | | | | | | | | | | | PathView was creating its own internal QFxVisualItemModel but not correctly setting the context. | ||||
* | | | | Handle Connection objects. | Roberto Raggi | 2009-04-27 | 1 | -149/+10 |
| | | | | |||||
* | | | | Merge branch 'kinetic-declarativeui' of ↵ | Roberto Raggi | 2009-04-27 | 59 | -2040/+744 |
|\ \ \ \ | |/ / / | | | | | | | | | git://scm.dev.nokia.troll.no/qt/kinetic into kinetic-declarativeui-qfx | ||||
| * | | | Remove QFxItem::itemContext() method. | Aaron Kennedy | 2009-04-27 | 14 | -51/+42 |
| | | | | | | | | | | | | | | | | Use qmlContext(object) instead. This makes everything consistent. | ||||
| * | | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-04-27 | 28 | -1894/+292 |
| |\ \ \ | | | |/ | | |/| | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | Add 'smooth' property to BlendedImage. | Michael Brasser | 2009-04-27 | 2 | -1/+42 |
| | | | | |||||
| | * | | Fix crash in PathView. | Michael Brasser | 2009-04-27 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | If a component had runtime errors it could cause PathView to crash. Now we check in rengenerate to make sure the model actually returns an item before using it. | ||||
| | * | | Rename GfxValue to QmlTimeLineValue. | Michael Brasser | 2009-04-27 | 10 | -130/+130 |
| | | | | |||||
| | * | | Rename GfxEvent to QmlTimeLineEvent. | Michael Brasser | 2009-04-27 | 5 | -27/+27 |
| | | | | |||||
| | * | | Replace the use of the obsolete GfxEasing with QEasingCurve. | Michael Brasser | 2009-04-27 | 22 | -1741/+96 |
| | | | | |||||
| * | | | Add a declarative data ptr to QObjectPrivate | Aaron Kennedy | 2009-04-27 | 21 | -66/+96 |
| |/ / | | | | | | | | | | This data ptr does not increase the size of the QObject, as we take advantage of space only used during destruction. Currently this data is only used to store an object's QmlContext, but it will be used for more later. | ||||
| * | | qdoc: Corrected a few qdoc warnings. | Martin Smith | 2009-04-24 | 2 | -14/+278 |
| | | | |||||
| * | | qdoc: Corrected a few qdoc warnings. | Martin Smith | 2009-04-24 | 2 | -14/+20 |
| | | | |||||
| * | | qdoc: Marked QSimpleCanvas and QSimpleCanvasItem internal | Martin Smith | 2009-04-24 | 2 | -0/+2 |
| | | | | | | | | | | | | They have almost no documentation and are generating many qdoc warnings. | ||||
| * | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Smith | 2009-04-24 | 2 | -85/+120 |
| |\ \ | | |/ | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | qdoc: Edited qdoc comments to remove some qdoc warnings. | Martin Smith | 2009-04-24 | 1 | -2/+15 |
| | | | |||||
* | | | No more sugar :-) | Roberto Raggi | 2009-04-24 | 4 | -11/+21 |
| | | | |||||
* | | | Don't generate T_AUTOMATIC_SEMICOLON when recovering from a syntax error. | Roberto Raggi | 2009-04-24 | 2 | -8/+14 |
| | | | |||||
* | | | Don't generate T_PUBLIC tokens. At this stage we don't know if we wil keep ↵ | Roberto Raggi | 2009-04-24 | 1 | -1/+1 |
| | | | | | | | | | | | | the syntax `public property|signal name' to define properties. | ||||
* | | | Use the DUI language. | Roberto Raggi | 2009-04-24 | 13 | -18/+57 |
| | | |