summaryrefslogtreecommitdiffstats
path: root/src/declarative
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-07-10217-4183/+6325
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui-gv Conflicts: examples/itemviews/frozencolumn/main.cpp src/declarative/canvas/qsimplecanvas.cpp src/declarative/canvas/qsimplecanvas_p.h src/declarative/canvas/qsimplecanvasitem.h src/declarative/extra/qfxparticles.cpp src/declarative/fx/fx.pri src/declarative/fx/qfxblurfilter.h src/declarative/fx/qfxcontentwrapper.cpp src/declarative/fx/qfxflickable.cpp src/declarative/fx/qfxfocuspanel.h src/declarative/fx/qfxfocusrealm.h src/declarative/fx/qfxhighlightfilter.cpp src/declarative/fx/qfxhighlightfilter.h src/declarative/fx/qfximage.cpp src/declarative/fx/qfxitem.cpp src/declarative/fx/qfxitem.h src/declarative/fx/qfxrect.cpp src/declarative/fx/qfxreflectionfilter.h src/declarative/fx/qfxshadowfilter.cpp src/declarative/fx/qfxshadowfilter.h src/declarative/fx/qfxtext.cpp src/declarative/fx/qfxtext.h src/declarative/fx/qfxtextedit.cpp src/declarative/opengl/glbasicshaders.h src/declarative/test/qfxtestengine.cpp src/declarative/test/qfxtestengine.h src/declarative/test/qfxtestobjects.cpp src/declarative/test/qfxtestobjects.h src/declarative/test/qfxtestview.h src/declarative/util/qfxglobal.h src/declarative/util/qfxview.cpp src/gui/graphicsview/qgraphicsitem_p.h tools/qmlviewer/qmlviewer.cpp
| * Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-07-097-21/+330
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * Fix QFxTextEdit cursorDelegate auto test properlyAlan Alpert2009-07-091-2/+3
| | | | | | | | | | | | Also fixes the minor bug that it found.
| | * Fix QFxTextEdit cursor delegate for multi-line and font changesAlan Alpert2009-07-091-0/+5
| | | | | | | | | | | | They weren't handled before, and now they are.
| | * Tests for QFxTextEdit selection propertiesAlan Alpert2009-07-091-0/+4
| | | | | | | | | | | | | | | | | | Also fixes some bugs that the tests uncovered. Also fixes the test, which was using a now invalid QmlComponent Constructor.
| | * selectionStart/End now work properlyAlan Alpert2009-07-091-19/+13
| | | | | | | | | | | | Autotests still in progress
| | * Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-07-082-5/+56
| | |\ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-07-0815-56/+236
| | | |\ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * | Add a modulus property to Follow to allow "wrapping".Martin Jones2009-07-082-5/+56
| | | | | | | | | | | | | | | | | | | | Also add clock example to demonstrate.
| | * | | Implement selectedText, selectionStart and selectionEnd properties.Alan Alpert2009-07-083-4/+140
| | | | | | | | | | | | | | | | | | | | | | | | | Still to go: Setting the selectionStart/End properties doesn't work and there are no autotests.
| | * | | Add highlightedTextColor property to the QFxTextEdit sophisticateAlan Alpert2009-07-083-0/+35
| | | | |
| | * | | Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-07-082-13/+18
| | |\ \ \ | | | | |/ | | | |/| | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * | Fix custom string convertors for animations.Michael Brasser2009-07-081-1/+1
| | | | |
| | | * | Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-07-086-9/+64
| | | |\ \ | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * | | Support custom string convertors for animations.Michael Brasser2009-07-082-13/+18
| | | | | |
| | * | | | Add Cursor Delegate to QFxTextEditAlan Alpert2009-07-083-1/+79
| | | |/ / | | |/| | | | | | | | | | | | | | | | | Adds the cursorDelegate property, including docs and autotest. No example is included because we don't really have a text example yet.
| * | | | Expand input keyword to include "as" supportAaron Kennedy2009-07-099-950/+1046
| | | | |
| * | | | DocAaron Kennedy2009-07-072-4/+4
| |/ / /
| * | | DocAaron Kennedy2009-07-071-2/+3
| | | |
| * | | Improve QmlComponent APIAaron Kennedy2009-07-075-7/+61
| |/ / | | | | | | | | | Having to use QUrl::fromLocalFile() is crummy. Add appropriate overloads the QmlComponent, and resolve relative paths against a "base url" set on the QmlEngine.
| * | Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-07-062-5/+5
| |\ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * \ Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-07-063-24/+40
| | |\ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | DocAaron Kennedy2009-07-062-5/+5
| | | |/ | | |/|
| * | | Add textFormat property to the Text element.Michael Brasser2009-07-064-4/+85
| | | |
| * | | Make TextEdit's cursor position usable from Qml.Michael Brasser2009-07-062-1/+24
| | |/ | |/|
| * | Fix bug in createQmlObjectAlan Alpert2009-07-061-9/+4
| | | | | | | | | | | | | | | Wasn't actually loading the object's context properly, with regard to url resolution.
| * | Doc fixesYann Bodson2009-07-061-1/+1
| | |
| * | Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-07-0327-1041/+979
| |\ \ | | |/ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * Add CONSTANT attribute where applicableAaron Kennedy2009-07-031-9/+9
| | |
| | * Warn annoyingly on non-notifyable propertiesAaron Kennedy2009-07-036-21/+55
| | |
| | * Move QmlExpression into its own fileAaron Kennedy2009-07-0310-597/+750
| | |
| | * Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-07-032-3/+9
| | |\ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * Small change to make move and replace methods overridable.Erik Verbruggen2009-07-022-3/+9
| | | |
| | * | Support parameterized synthesized methodsAaron Kennedy2009-07-027-166/+221
| | |/
| | * Remove Content and ContentWrapperAaron Kennedy2009-07-025-310/+0
| | | | | | | | | | | | property aliases do a better job of this
| * | Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-07-0248-204/+368
| |\ \ | | |/ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-07-0244-177/+177
| | |\ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * We should wait for component completion before trying to load XmlListModel data.Michael Brasser2009-07-022-6/+13
| | | | | | | | | | | | | | | | | | | | This gets rid of the meaningless "empty src" warning when the demos using XmlListModel are first started.
| | | * Fix warningMichael Brasser2009-07-021-1/+1
| | | |
| | | * Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-07-0234-1342/+1460
| | | |\ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | | * Merge branch 'kinetic-declarativeui' of ↵Yann Bodson2009-07-0231-1342/+1420
| | | | |\ | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | | * | Add smooth property to Text element.Yann Bodson2009-07-023-1/+31
| | | | | |
| | | * | | Fix warnings.Michael Brasser2009-07-023-4/+4
| | | | | |
| | | * | | Make performance logging classes private.Michael Brasser2009-07-0225-27/+37
| | | | | |
| | | * | | Move timeline class to util and make private.Michael Brasser2009-07-0211-106/+47
| | | | | |
| | | * | | PropertyAnimation optimization and animation code cleanup.Michael Brasser2009-07-021-30/+15
| | | | | |
| | * | | | Initial property aliasing supportAaron Kennedy2009-07-028-29/+220
| | | | | | | | | | | | | | | | | | | | | | | | Currently very basic - the only alias "script" that is allowed is Id.property
| * | | | | Improve JS dynamic creationAlan Alpert2009-07-022-20/+41
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renamed evalQml to be consistent with us, not javascript. Fixed bug where createComponent never had the right path. createQmlObject (evalQml) now has a parent as a argument. It also still has a bug where that parent doesnt get set properly, although it is used as the creation context also.
| * | | | Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-07-0229-1340/+1391
| |\ \ \ \ | | |/ / / | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-07-0214-102/+264
| | |\ \ \ | | | | |/ | | | |/| | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
generated by cgit v0.12 at 2025-01-20 07:55:20 (GMT)