Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | QDeclarativeView: Make usable in Designer | Friedemann Kleint | 2010-03-05 | 1 | -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 WinCE | Maurice Kalinowski | 2010-03-02 | 1 | -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.7 | Thiago Macieira | 2010-02-27 | 68 | -4427/+5216 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | Revert "Some animation cleanup/refactoring." | Leonardo Sobral Cunha | 2010-02-26 | 2 | -20/+12 |
| | | | | | | | | This reverts commit b5700759da7bccf0ccd6e20b1727950532894ad2. | ||||
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Warwick Allison | 2010-02-26 | 1 | -0/+2 |
| |\ | |||||
| | * | Polish QDeclarativeProperty API | Aaron Kennedy | 2010-02-26 | 1 | -0/+2 |
| | | | |||||
| * | | Rename files to follow class name. | Warwick Allison | 2010-02-26 | 4 | -4/+4 |
| | | | | | | | | | | | | Task-number: QT-2822 | ||||
| * | | Change Connection syntax as per QT-2822. | Warwick Allison | 2010-02-26 | 3 | -166/+130 |
| |/ | |||||
| * | Fix ParentAnimation crash. | Michael Brasser | 2010-02-26 | 2 | -3/+9 |
| | | |||||
| * | Some animation cleanup/refactoring. | Michael Brasser | 2010-02-26 | 2 | -12/+20 |
| | | |||||
| * | Add ParentAnimation. | Michael Brasser | 2010-02-26 | 6 | -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. | ||||
| * | Rename QDeclarativeMetaProperty -> QDeclarativeProperty | Aaron Kennedy | 2010-02-25 | 18 | -87/+87 |
| | | | | | | | | There's nothing meta about our properties. | ||||
| * | Document and test resetting properties in a state change. | Michael Brasser | 2010-02-25 | 1 | -1/+28 |
| | | | | | | | | Task-number: QT-1817 | ||||
| * | Handle smooth reparenting where the item being reparented has a complex | Michael Brasser | 2010-02-25 | 1 | -11/+12 |
| | | | | | | | | | | | | transform. Fixes pathview <-> details transition in flickr demo. | ||||
| * | Make more private QDeclarativeMetaProperty methods private | Aaron Kennedy | 2010-02-25 | 3 | -8/+11 |
| | | |||||
| * | doc | Warwick Allison | 2010-02-25 | 1 | -3/+1 |
| | | |||||
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Martin Jones | 2010-02-25 | 1 | -0/+3 |
| |\ | |||||
| | * | Fix QDeclarativePropertyAnimation to avoid property writes while stopped | Leonardo Sobral Cunha | 2010-02-25 | 1 | -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 Package | Martin Jones | 2010-02-25 | 1 | -0/+27 |
| |/ | |||||
| * | Remove QDeclarativeMetaProperty::createProperty() method | Aaron Kennedy | 2010-02-25 | 3 | -6/+6 |
| | | | | | | | | | | The behavior of createProperty() (to resolve dot properties) is now the behavior of the constructors. | ||||
| * | Move private QDeclarativeMetaProperty functions into the private class | Aaron Kennedy | 2010-02-25 | 5 | -15/+20 |
| | | | | | | | | | | | | 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. | ||||
| * | Revert "Add QDeclarativeGraphicsWidget, a QGraphicsWidget version of QmlView" | Aaron Kennedy | 2010-02-25 | 3 | -574/+2 |
| | | | | | | | | This reverts commit 327d212f5cff81f1c21b7be5c54b3e1eab4f0ac5. | ||||
| * | Fix building without the XmlPatterns Module | Alan Alpert | 2010-02-24 | 1 | -0/+2 |
| | | |||||
| * | Add QDeclarativeGraphicsWidget, a QGraphicsWidget version of QmlView | Alan Alpert | 2010-02-24 | 3 | -2/+574 |
| | | | | | | | | | | | | | | | | | | Could use to be renamed. Possibly to -QDeclarativeViewGraphicsWidget -QGraphicsDeclarativeViewWidget (Or QGraphicsD20, in the spirit of i18n) But those aren't any shorter. Task-number: QTBUG-7067 | ||||
| * | Make QDeclarativeMetaType and QDeclarativeType private | Aaron Kennedy | 2010-02-24 | 2 | -3/+3 |
| | | |||||
| * | Simplify QML element registration headers | Aaron Kennedy | 2010-02-24 | 9 | -1/+10 |
| | | |||||
| * | Add an "asynchonous" property to Image. | Martin Jones | 2010-02-24 | 2 | -36/+67 |
| | | | | | | | | | | Allows loading/decoding local images in an asynchronous thread (already the case for network images). | ||||
| * | Change class prefix to from QmlXXX to QDeclarativeXXX, QmlGraphicsXXX to ↵ | Warwick Allison | 2010-02-24 | 65 | -2962/+2962 |
| | | | | | | | | QDeclarativeXXX. | ||||
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Warwick Allison | 2010-02-24 | 11 | -2/+24 |
| |\ | | | | | | | | | | | | | Conflicts: src/declarative/qml/qml.h | ||||
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt | Martin Jones | 2010-02-24 | 11 | -2/+24 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/advtutorial1.qdoc src/declarative/qml/qmlmoduleplugin.cpp src/declarative/util/qmlxmllistmodel.cpp | ||||
| * | \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Warwick Allison | 2010-02-24 | 1 | -12/+12 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Martin Jones | 2010-02-23 | 5 | -168/+103 |
| | |\ \ | |||||
| | * | | | Fix illegal access in QmlStyledText and add auto tests | Martin Jones | 2010-02-23 | 1 | -12/+12 |
| | | | | | |||||
| * | | | | Merge fix. | Warwick Allison | 2010-02-23 | 1 | -1/+6 |
| | | | | | |||||
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Warwick Allison | 2010-02-23 | 11 | -233/+285 |
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | Conflicts: src/declarative/util/qmlanimation.cpp src/declarative/util/qmlxmllistmodel.cpp | ||||
| | * | | | Merge remote branch 'origin/master' into qtruntime | Roberto Raggi | 2010-02-23 | 11 | -189/+239 |
| | |\ \ \ | |||||
| | | * | | | Adds QmlEasingValueType to qml | Leonardo Sobral Cunha | 2010-02-23 | 3 | -123/+51 |
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now it's possible to use easing curve types directly in qml as value types, {easing.type: "OutBounce"; easing.amplitude: 3}, instead of the former ugly string format, like "easeOutBounce(amplitude:3.0)". Reviewed-by: akennedy | ||||
| | | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Martin Jones | 2010-02-23 | 7 | -39/+152 |
| | | |\ \ | |||||
| | | | * \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Bea Lam | 2010-02-23 | 6 | -8/+4 |
| | | | |\ \ | |||||
| | | | | * | | QmlExpression API review | Aaron Kennedy | 2010-02-23 | 3 | -4/+0 |
| | | | | | | | |||||
| | | | | * | | Make QmlBinding (and friends) private | Aaron Kennedy | 2010-02-23 | 4 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QmlBinding exposes way too many implementation details to be confident about making it public right now. | ||||
| | | | * | | | Doc fix. | Bea Lam | 2010-02-23 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-2831 | ||||
| | | | * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Bea Lam | 2010-02-23 | 63 | -1166/+1139 |
| | | | |\ \ \ | | | | | |/ / | |||||
| | | | * | | | Add XmlRole::isKey property for incremental data changes when reload() | Bea Lam | 2010-02-23 | 1 | -29/+146 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is called. Task-number: QT-2831 | ||||
| | | * | | | | Remove QmlView::execute(). QmlView::setSource() does it all now. | Martin Jones | 2010-02-23 | 2 | -27/+36 |
| | | | |/ / | | | |/| | | | | | | | | | | | | | | Task-number: QT-2538 | ||||
| | * | | | | Compile. | Roberto Raggi | 2010-02-22 | 1 | -2/+0 |
| | | | | | | |||||
| | * | | | | Merge remote branch 'origin/master' into qtruntime | Roberto Raggi | 2010-02-22 | 25 | -417/+286 |
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/qml/qml.pri src/declarative/qml/qmlengine.cpp src/declarative/util/qmlview.h | ||||
| | * | | | | Introduced the internal virtual method QmlView::setRootObject(object). | Roberto Raggi | 2010-02-19 | 2 | -45/+54 |
| | | | | | | | | | | | | | | | | | | | | | | | | Done-with: mae | ||||
| * | | | | | Remove QML_DEFINE_... macros, now use QML_REGISTER_... macros calls. | Warwick Allison | 2010-02-23 | 28 | -131/+309 |
| | |/ / / | |/| | | | | | | | | | | | | | Task-number: QT-2798 | ||||
* | | | | | doc: Added \since 4.7 to several \qmlclass elements. | Martin Smith | 2010-02-26 | 10 | -11/+24 |
| |_|_|/ |/| | | |