summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-05-20270-4731/+6563
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Fix Rotation element for OpenGL.Michael Brasser2009-05-201-1/+3
| |
| * Remove unnecessary codeAaron Kennedy2009-05-201-2/+0
| |
| * Fix breakage.Warwick Allison2009-05-201-0/+2
| | | | | | | | Line was accidentally deleted.
| * compileWarwick Allison2009-05-201-3/+3
| |
| * typoWarwick Allison2009-05-202-2/+2
| |
| * Don't recreate text layout everytime it is used.Michael Brasser2009-05-192-13/+12
| |
| * Fix docs.Michael Brasser2009-05-192-4/+4
| |
| * Resolved reduce/reduce conflict between QML array literals and JS array ↵Roberto Raggi2009-05-195-849/+958
| | | | | | | | literals.
| * no need to translate graphics events to regular onesLars Knoll2009-05-191-36/+3
| | | | | | | | | | QTextControl can handle graphics mouse events directly, no need to translate them to regular mouse events.
| * Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-05-19105-360/+465
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * Merge branch 'kinetic-declarativeui' of ↵Roberto Raggi2009-05-1912-126/+341
| | |\ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * Merge branch 'kinetic-declarativeui' of ↵Kai Koehne2009-05-197-115/+187
| | | |\ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | | * Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-05-193-13/+91
| | | | |\ | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | | | * Make sure Flippable updates its back transform correctly.Michael Brasser2009-05-192-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we didn't update the back transform on geometry changes to the back element. Now we make sure it is up-to-date whenever we show it. Also updated anchors (they no longer need to work around this).
| | | | * | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-05-193-2/+35
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | | * | | Fix pens, at small sizesWarwick Allison2009-05-192-59/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See 504c489d40e815397235ba26df7f06aae821c88a Also fixes 0 width (hairline) pens.
| | | | * | | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-05-1975-2235/+2186
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/fx/qfxrect.cpp
| | | | * | | | Fix pens.Warwick Allison2009-05-195-65/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now corresponds to standard Qt painting; in particular, penwidth extends outside rectangle. Task-number: 249318
| | | * | | | | Added QmlEngine::componentSearchPath()Kai Koehne2009-05-192-0/+31
| | | | |_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | componentSearchPath() returns the list of urls (folders) inspected by qml to locate sub components. This is used in Bauhaus. Autotests have been stored in new "declarative/qmlengine" directory.
| | * | | | | Fixed #includesRoberto Raggi2009-05-1898-245/+247
| | | | | | |
| * | | | | | Add a SetProperties::restoreEntryValues property to store the state ↵Aaron Kennedy2009-05-194-3/+24
| | |/ / / / | |/| | | | | | | | | | | | | | | | restoring property entry values
| * | | | | Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-05-193-2/+35
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | | Docs and minor fixes for the Rotation element.Michael Brasser2009-05-192-1/+32
| | | | | |
| | * | | | Add missing clearItem() flagAaron Kennedy2009-05-191-1/+3
| | | |_|/ | | |/| |
| * | | | Fixes particle clipping bugAlan Alpert2009-05-191-8/+88
| |/ / / | | | | | | | | | | | | Particles painting moved to an item with an accurate bounding box.
| * | | Remove debug.Michael Brasser2009-05-181-1/+0
| |/ /
| * | Merge branch 'kinetic-declarativeui' of ↵Erik Verbruggen2009-05-1810-902/+1006
| |\ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | Do not store empty type names in QmlMetaTypeKai Koehne2009-05-181-1/+2
| | | |
| | * | Renamed qualifiedObjectNameId.Roberto Raggi2009-05-183-12/+12
| | | |
| | * | Compile.Roberto Raggi2009-05-182-3/+3
| | | |
| | * | Introduced qualified type names in the grammar.Roberto Raggi2009-05-188-896/+989
| | | |
| | * | Allow mapping from QMetaObject * to corresponding QmlTypeKai Koehne2009-05-182-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed in Bauhaus to get the QmlType of a parent QMetaObject. Also, mark QmlType class as to be exported. Reviewed-by: Aaron Kennedy
| * | | Fixed the addition of "id" to the list of QmlDomObject properties.Erik Verbruggen2009-05-181-2/+1
| | | |
| * | | Added "id" to the list of QmlDomObject properties, so we can get to theErik Verbruggen2009-05-181-5/+1
| |/ / | | | | | | | | | location information.
| * | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-05-1843-448/+477
| |\ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * \ Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic ↵Michael Brasser2009-05-1836-409/+401
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into kinetic-declarativeui Conflicts: src/corelib/animation/qanimationgroup.cpp src/corelib/animation/qvariantanimation.cpp src/gui/graphicsview/qgraphicsitem.cpp
| | | * | Avoid resetting the QVariantAnimation::currentValue when changing stateLeonardo Sobral Cunha2009-05-151-2/+0
| | | | | | | | | | | | | | | | | | | | Reviewed-by: janarve
| | | * | General refactors in QVariantAnimationLeonardo Sobral Cunha2009-05-152-27/+35
| | | | | | | | | | | | | | | | | | | | Reviewed-by: janarve
| | | * | Update current value on QVariantAnimation::setKeyValuesLeonardo Sobral Cunha2009-05-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current value was udpated on setKeyValueAt, but not on setKeyValues and this was leading to a semantic inconsistency. Reviewed-by: janarve
| | | * | Avoid interpolating if we have less than 2 key values in QVariantAnimationLeonardo Sobral Cunha2009-05-151-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we have less than 2 key values, we should neither try to interpolate nor set the current value. Reviewed-by: janarve
| | | * | Indentation and whitespace fixes in animation apiLeonardo Sobral Cunha2009-05-155-13/+10
| | | | |
| | | * | Merge branch 'kinetic-animations' into kinetic-statemachineKent Hansen2009-05-143-1/+5
| | | |\ \
| | | | * \ Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic ↵David Boddie2009-05-1319-295/+115
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | into kinetic-animations
| | | | | * | correctly handle multiple event transitions for same (object,event)Kent Hansen2009-05-132-7/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The event filter was not removed at the right time. We now store the number of active event transitions for a particular (object,event) and only remove the filtering when the count drops to zero.
| | | | * | | Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic ↵David Boddie2009-05-12238-3127/+6257
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into kinetic-animations
| | | | * \ \ \ Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic ↵David Boddie2009-04-296-131/+171
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into kinetic-animations
| | | | * | | | | Merged local changes.David Boddie2009-04-293-1/+5
| | | | | | | | |
| | | * | | | | | Make QAbstractTransition::eventTest() non-constEskil Abrahamsen Blomfeldt2009-05-1417-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We decided to remove the const of the eventTest() since some transitions have dynamic conditions and need to update when eventTest() is called.
| | | * | | | | | correctly handle multiple event transitions for same (object,event)Kent Hansen2009-05-132-7/+14
| | | | |_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The event filter was not removed at the right time. We now store the number of active event transitions for a particular (object,event) and only remove the filtering when the count drops to zero.