summaryrefslogtreecommitdiffstats
path: root/src/declarative
Commit message (Collapse)AuthorAgeFilesLines
* crashfix for tst_qdeclarativeanimations::badTypes()Thomas Hartmann2010-09-152-6/+7
| | | | | | | We always have to check for 0 before converting a raw pointer into a smart pointer Reviewed-by: Kai Koehne
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-1516-53/+845
|\ | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Compile with QT_NO_GESTURES. Give file and line error information for errors in dummydata. Restore any absolute geometry changed by AnchorChanges when returning Export QDeclarativeScriptAction Completing the interface for children/data/resources Unit tests for Bauhaus enablers This patch allows modifications on PropertyChanges on the fly
| * Restore any absolute geometry changed by AnchorChanges when returningMichael Brasser2010-09-151-0/+54
| | | | | | | | | | | | to the base state. Task-number: QTBUG-11834
| * Export QDeclarativeScriptActionMarco Bubke2010-09-141-1/+1
| | | | | | | | It is needed in Bauhaus to disable the animation.
| * Completing the interface for children/data/resourcesThomas Hartmann2010-09-144-3/+120
| | | | | | | | | | | | | | | | This patch makes the handling of properties like children and data easier in Bauhaus. Especially in the case of property alias Reviewed-by: Aaron Kennedy
| * This patch allows modifications on PropertyChanges on the flyThomas Hartmann2010-09-1411-49/+670
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is important for Bauhaus to ensure that we can edit properties and states dynamically in the visual editor Most of the changes consist of added functions for Bauhaus, that do not affect any current behaviour. Important changes: QDeclarativeAbstractBinding is holding a QSharedPointer to itself so that other classes can hold a weak reference to avoid accessing dangling pointers while keeping track of bindings. QDeclarativeStateOperation now has its own private class QDeclarativeStateOperationPrivate to hold a pointer back to QDeclarativeState since the parent is not set correctly in every context. QDeclarativePropertyChangesPrivate does now hold a QDeclarativeGuard instead of a raw pointer to the target QObject. In Bauhaus the target object might be deleted. Reviewed-by: Aaron Kennedy
* | Rename "interface" in qdeclarativeinterface.h to "qmlInterface"Rhys Weatherley2010-09-151-2/+2
|/ | | | | | | | The "interface" name is #define'd to "struct" in Windows COM headers in some SDK's, and creates problems when such headers are mixed with QML bindings. Reviewed-by: Joona Petrell
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-144-8/+8
|\ | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: L10n: Update German translations for 4.7.1, part 1. build fix for configure.exe I18n: Fix some lupdate warnings. Fix compile warnings. expose GestureType for using in QML
| * I18n: Fix some lupdate warnings.Friedemann Kleint2010-09-141-4/+4
| |
| * Fix compile warnings.Friedemann Kleint2010-09-143-4/+4
| | | | | | | | Reviewed-by: Thomas Hartmann <thomas.hartmann@nokia.com>
* | In ParentChange treat flip in x and y as a 180 degree rotationMartin Jones2010-09-142-4/+6
|/ | | | | | | The two are equivalent, but flip doesn't work in ParentChange. Task-number: QTBUG-13554 Reviewed-by: Michael Brasser
* When onDoubleClicked: is handled don't emit a second onPressed/onClickedMartin Jones2010-09-132-7/+16
| | | | | Task-number: QTBUG-12250 Reviewed-by: Michael Brasser
* Ensure flickable velocity is updated when view is moved by setCurrentIndexMartin Jones2010-09-134-3/+8
| | | | Task-number: QTBUG-13543
* Autotest for QTBUG-13454.Yann Bodson2010-09-101-2/+1
|
* Changing the Image 'source' should not go through the 'Loading' state if the ↵Yann Bodson2010-09-101-10/+13
| | | | | | | image is cached. Task-number: QTBUG-13454 Reviewed-by: Martin Jones
* Update running animations if a SmoothedAnimation is changedAlan Alpert2010-09-092-1/+20
| | | | | | | This behavior is consistent with the other animations. Task-number: QTBUG-12336 Reviewed-by: Leonardo Sobral Cunha
* Fix SmoothedAnimation test and docsAlan Alpert2010-09-091-1/+7
| | | | | | | | | The SmoothedAnimation visual test was misleading, and has been expanded to include more common use cases. The property documentation was also slightly extended. This should help solve the confusion in the related task. Task-number: QTBUG-12114
* Fix reversingModes of QDeclarativeSmoothedAnimationAlan Alpert2010-09-091-2/+3
| | | | | | | None of them actually worked. The updated visual test now shows the correct behavior. Task-number: QTBUG-13513
* Don't cause repaints during painting in Text elementMartin Jones2010-09-081-9/+7
| | | | | | | | | | Calling prepareGeometryChange in a paint event is a bad idea and was causing jerky scrolling. There is no longer any need for the removed code since we don't use imgCache.size() to determine boundingRect() anymore. Task-number: QTBUG-13453 Reviewed-by: Joona Petrell
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-09-0818-350/+530
|\
| * Remove unused objectBea Lam2010-09-081-1/+0
| |
| * Fix Worker ListModel to emit the right signal when items changeBea Lam2010-09-081-1/+1
| |
| * Merge branch '4.7' into qmldocsDavid Boddie2010-09-078-173/+239
| |\
| * | Doc: More work on the QML documentation.David Boddie2010-09-073-23/+37
| | |
| * | Merge branch '4.7' into qmldocsDavid Boddie2010-09-067-39/+59
| |\ \
| * | | Doc: Worked on two more elements, replacing an image.David Boddie2010-09-061-10/+19
| | | |
| * | | Merge branch '4.7' into qmldocsDavid Boddie2010-09-036-16/+27
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/snippets/declarative/qml-intro/basic-syntax.qml
| * | | | Doc: qdoc fixes.David Boddie2010-09-021-1/+1
| | | | |
| * | | | Doc: Added types to method and signal documentation; other fixes.David Boddie2010-09-018-49/+58
| | | | |
| * | | | Merge branch '4.7' into qmldocsDavid Boddie2010-09-0158-1694/+1893
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativetext.cpp src/declarative/graphicsitems/qdeclarativetextedit.cpp
| * | | | | Doc: More work on QML documentation and snippets.David Boddie2010-09-011-5/+6
| | | | | |
| * | | | | Merge branch '4.7' into qmldocsDavid Boddie2010-08-2734-116/+255
| |\ \ \ \ \
| * | | | | | Doc: More work on the QML documentation.David Boddie2010-08-273-204/+263
| | | | | | |
| * | | | | | Merge branch '4.7' into qmldocsDavid Boddie2010-08-2412-118/+111
| |\ \ \ \ \ \
| * | | | | | | Doc: Fixed incorrect use of commands to mark documentation.David Boddie2010-08-233-3/+1
| | | | | | | |
| * | | | | | | Doc: Started to improve QML reference documentation.David Boddie2010-08-233-61/+150
| | | | | | | |
* | | | | | | | SpringAnimation velocity animation stop logic was fragile.Martin Jones2010-09-081-11/+26
| |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than stopping the animation when the target was reached, calculate the duration it will take. This eliminates the possibility of rounding errors causing the animation to stop at the wrong time. Task-number: QTBUG-13044 Reviewed-by: Aaron Kennedy
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-09-072-16/+3
|\ \ \ \ \ \ \
| * | | | | | | Fix AnchorAnimation for multiple AnchorChanges with dependancies.Michael Brasser2010-09-062-16/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When rewinding, don't reapply bindings, only values. This is consistent with how we handle rewinding other property bindings. Task-number: QTBUG-13398
* | | | | | | | ListView: Ensure highlight is positioned correctly in positionViewAtIndex().Martin Jones2010-09-071-15/+56
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also update the currentItem position during flicking and avoid resizing the highlight on section boundaries. Task-number: QT-3870
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-09-061-7/+5
|\ \ \ \ \ \ \
| * | | | | | | Small cleanupAaron Kennedy2010-09-061-7/+5
| | | | | | | |
* | | | | | | | Fix PathView item position on insertion and removal.Martin Jones2010-09-063-128/+170
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure the offset is adjusted to account for the new or removed items. Also minor optimizations to delegate updates. Task-number: QTBUG-13416
* | | | | | | Do not reset sourceSize when changing image source url.Yann Bodson2010-09-061-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13383
* | | | | | | Ensure all image state is updated before emitting changed signals.Martin Jones2010-09-061-5/+6
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | statusChanged() was emitted before the size was set, so if you did, e.g. if (width != 0) in onStatusChanged it would get the wrong width. Task-number: QT-3820 Reviewed-by: Yann Bodson
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-09-051-25/+23
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-09-034-8/+24
| |\ \ \ \ \ \
| * | | | | | | Cleanup visible item checking in positionersAlan Alpert2010-09-031-25/+23
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Especially in Grid, where it wasn't being done right. Task-number: QTBUG-12610 Reviewed-by: Martin Jones
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-09-037-20/+38
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | qreal == float fixesAaron Kennedy2010-09-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | QTBUG-11853