summaryrefslogtreecommitdiffstats
path: root/src/declarative
Commit message (Collapse)AuthorAgeFilesLines
* Fix visibility of classes in private headers upon which Bauhaus/Creator relies.Warwick Allison2010-03-052-3/+3
| | | | | Author: Erik Verbruggen (cherry picked from commit b67d5d90a306534a1ea2fcb333981c6b1126105c)
* Don't return QDeclarativeDeclarativeData for a deleting objectAaron Kennedy2010-03-052-2/+6
| | | | | This was causing crashes in the qmldesigner. (cherry picked from commit 3b8cad8be96d7791e8ca8305609d1155ec093b80)
* QDeclarativeView: Make usable in DesignerFriedemann Kleint2010-03-051-1/+3
| | | | | | | Make source a designable property, add missing declarations for enumerations. Reviewed-by: akennedy <qt-info@nokia.com> (cherry picked from commit 0998fc069512d0ae2853929489b80f35e0d9d4ae)
* compile fix for WinCEMaurice Kalinowski2010-03-021-0/+2
| | | | | | | do not include headers of disabled modules Reviewed-by: Paul Olav Tvete (cherry picked from commit 4795583b42577259499b34da07077f501e45ce42)
* Merge remote branch 'origin/master' into 4.7Thiago Macieira2010-02-27330-21634/+23196
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qmetatype.cpp src/declarative/graphicsitems/qdeclarativeevents.cpp src/declarative/graphicsitems/qdeclarativeflickable.cpp src/declarative/graphicsitems/qdeclarativegridview.cpp src/declarative/qml/qdeclarativescript.cpp src/declarative/util/qdeclarativeanimation.cpp src/declarative/util/qdeclarativebehavior.cpp src/declarative/util/qdeclarativeeasefollow.cpp src/declarative/util/qdeclarativefontloader.cpp src/declarative/util/qdeclarativelistmodel.cpp src/declarative/util/qdeclarativespringfollow.cpp src/declarative/util/qdeclarativestategroup.cpp src/declarative/util/qdeclarativesystempalette.cpp src/declarative/util/qdeclarativetimer.cpp src/declarative/util/qmlstateoperations.cpp src/multimedia/qml/qdeclarativeaudio.cpp src/multimedia/qml/qdeclarativevideo.cpp
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-2612-353/+444
| |\
| | * Revert "Some animation cleanup/refactoring."Leonardo Sobral Cunha2010-02-262-20/+12
| | | | | | | | | | | | This reverts commit b5700759da7bccf0ccd6e20b1727950532894ad2.
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlWarwick Allison2010-02-269-81/+281
| | |\
| | | * DocAaron Kennedy2010-02-262-13/+150
| | | |
| | | * update painted geometry on pixmapChanged rather than sourceChangedYann Bodson2010-02-262-10/+3
| | | |
| | * | Rename files to follow class name.Warwick Allison2010-02-264-4/+4
| | | | | | | | | | | | | | | | Task-number: QT-2822
| | * | Change Connection syntax as per QT-2822.Warwick Allison2010-02-264-166/+135
| | | |
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-2610-73/+160
| |\ \ \ | | | |/ | | |/|
| | * | Polish QDeclarativeProperty APIAaron Kennedy2010-02-266-58/+128
| | |/
| | * Test, demo, and work-around bug QTBUG-8535Warwick Allison2010-02-261-0/+3
| | |
| | * Fix ParentAnimation crash.Michael Brasser2010-02-262-3/+9
| | |
| | * Some animation cleanup/refactoring.Michael Brasser2010-02-262-12/+20
| | |
| * | Make Flickable overshoot behavior nicer.Martin Jones2010-02-263-27/+58
| | |
| * | Tiny doc tweak.Martin Jones2010-02-261-1/+1
| |/
| * Fix Flickable.overShoot doc - it is a bool not a realMartin Jones2010-02-261-2/+2
| |
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-265-47/+57
| |\
| | * Remove unnecessary QDeclarativeProperty::Type enum valuesAaron Kennedy2010-02-263-22/+43
| | |
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlBea Lam2010-02-266-7/+486
| | |\
| | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlBea Lam2010-02-2556-1366/+1535
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/qml/qdeclarativeproperty.cpp
| | * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlBea Lam2010-02-2513-10/+120
| | |\ \ \
| | * \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlBea Lam2010-02-254-29/+27
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlBea Lam2010-02-2552-743/+872
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/qml/qdeclarativemetaproperty.cpp
| | * | | | | | Automatically connect to signals "onFooChanged" if property is "foo".Bea Lam2010-02-253-25/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This follows on from a2a8cea2835ef24104fe784b6ce0f508cc5637c0 to make it work for PropertyChanges and QDeclarativeMetaProperty as well. Task-number: QT-2783
| * | | | | | | Renamed Flickable viewportXXX properties contentXXXMartin Jones2010-02-265-80/+62
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | A viewport is the thing you look through, not what you look at.
| * | | | | | Add ParentAnimation.Michael Brasser2010-02-266-7/+486
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ParentAnimation will replace ParentAction. It provides two advantages: * It will animate correctly when reversed. * It allows reparenting via another item, which is useful in the presence of clips, for example.
| * | | | | Protect against double initialization.Roberto Raggi2010-02-252-6/+20
| | | | | |
| * | | | | Fix compilation due to enabling of QStringBuilder throughoutThiago Macieira2010-02-251-1/+1
| | | | | |
| * | | | | Merge branch 'master' of git:qt/qt-qmlThiago Macieira2010-02-25324-19071/+19942
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativeparticles.cpp
| | * | | | | Don't look for contextual keywords when defining properties.Roberto Raggi2010-02-253-632/+658
| | | | | | |
| | * | | | | Introduced QDeclarativeExtensionPlugin::registerTypes(uri).Roberto Raggi2010-02-255-6/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now, you have to reimplement registerTypes(uri) to expose native QML types, and initializeEngine(engine,uri) to add instances to the QML engine's root context.
| | * | | | | Rename QDeclarativeMetaProperty -> QDeclarativePropertyAaron Kennedy2010-02-2544-317/+316
| | | | | | | | | | | | | | | | | | | | | | | | | | | | There's nothing meta about our properties.
| | * | | | | Introduced alternative syntax for defining QML bindings.Roberto Raggi2010-02-257-1000/+1072
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now it is possible to define bindings using the `on' context keyword. For example, you can write Behavior on opacity { NumberAnimation { duration: 500 } } instead of opacity: Behavior { NumberAnimation { duration: 500 } }
| | * | | | | Document and test resetting properties in a state change.Michael Brasser2010-02-251-1/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-1817
| | * | | | | Handle smooth reparenting where the item being reparented has a complexMichael Brasser2010-02-251-11/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | transform. Fixes pathview <-> details transition in flickr demo.
| | * | | | | Make more private QDeclarativeMetaProperty methods privateAaron Kennedy2010-02-2514-77/+82
| | | | | | |
| | * | | | | docWarwick Allison2010-02-251-3/+1
| | | |_|_|/ | | |/| | |
| | * | | | Fix documentation following MouseRegion -> MouseArea changeMartin Jones2010-02-251-9/+9
| | | | | |
| | * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-251-0/+3
| | |\ \ \ \
| | | * | | | Fix QDeclarativePropertyAnimation to avoid property writes while stoppedLeonardo Sobral Cunha2010-02-251-0/+3
| | | | |_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid changing the value of the property, while the animation is stopped. This was triggered while changing the duration of the animation, while it was stopped. Task-number: QTBUG-8507 Reviewed-by: Michael Brasser
| | * | | | Document PackageMartin Jones2010-02-252-0/+54
| | | | | |
| | * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-2517-816/+215
| | |\ \ \ \ | | | |/ / /
| | | * | | Tweak QDeclarativeMetaProperty type category APIAaron Kennedy2010-02-254-29/+27
| | | | |/ | | | |/|
| | | * | Remove QDeclarativeMetaProperty::AttachedAaron Kennedy2010-02-253-40/+13
| | | | | | | | | | | | | | | | | | | | | | | | | We now prohibit QDeclarativeMetaProperty ever getting into a state where it is pointing to the attached object itself.
| | | * | Remove QDeclarativeMetaProperty::createProperty() methodAaron Kennedy2010-02-255-112/+92
| | | | | | | | | | | | | | | | | | | | | | | | | The behavior of createProperty() (to resolve dot properties) is now the behavior of the constructors.
| | | * | Move private QDeclarativeMetaProperty functions into the private classAaron Kennedy2010-02-2510-49/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't want to allow manipulation of bindings and signal properties through the public API. Equivalents of the public functions now exist in QDeclarativeMetaPropertyPrivate for internal use.