summaryrefslogtreecommitdiffstats
path: root/src/declarative
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-081-3/+7
|\
| * Don't emit activeFocusChanged() unless the active focus actually changedTor Arne Vestbø2010-12-071-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We would previously call subFocusItemChanged(0) on the item as part of clearing the subfocus, even if the item in question would recieve a new subfocus item as part of setting the new subfocus. This resulted in the declarative item emitting activeFocusChanged(false) and then activeFocusChanged(true), which was affecting any animation or state bound to the activeFocus property of the item. We now stop clearing the subfocus when encountering an item that we know will get subfocus during the set-subfocus pass. We then set subfocus all the way to the root item, since the subfocus item itself might change. The effect of this is that the declarative item will only get one call to subFocusItemChanged(), passing the new subfocus item, instead of two. This means the declarative item can keep track of wherther ot not it had a subfocus item previously, and only emit activeFocusChanged() when the active focus goes from true to false or false to true. Task-number: QTBUG-15615 Reviewed-by: Yoann Lopes <yoann.lopes@nokia.com>
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-12-0636-391/+841
|\ \
| * \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-031-0/+3
| |\ \ | | |/
| | * Mention that image providers should be added before loading QML filesBea Lam2010-12-031-0/+3
| | |
| * | Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-024-3/+42
| |\ \ | | |/
| | * Append qml import path individually for each available drive on SymbianJoona Petrell2010-12-022-2/+33
| | | | | | | | | | | | | | | Task-number: QTBUG-15405 Reviewed-by: Jason Barron
| | * Update TextInput when echoMode changes.Yann Bodson2010-12-021-1/+1
| | | | | | | | | | | | | | | Task-number: QTBUG-15779 Reviewed-by: Martin Jones
| | * Ensure semi-transparent rects paint correctly with radius == size/2.Martin Jones2010-12-021-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | The margins could overlap, which caused overpainting. Ensure the margins are always <= width or height /2. Task-number: QTBUG-14657 Reviewed-by: Yann Bodson
| | * Rectangle should not paint with negative width or heightChristopher Ham2010-12-021-0/+2
| | | | | | | | | | | | | | | Task-number: QTBUG-15250 Reviewed-by: Martin Jones
| * | Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-016-19/+58
| |\ \ | | |/
| | * ListView header is not visible initially.Martin Jones2010-12-012-12/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | If the header size was not set explicitly, but determined implicitly from Text height, the view was not positioned so that the header was visible when first shown. Task-number: QTBUG-15599 Reviewed-by: Bea Lam
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-012-2/+26
| | |\ | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Change pen correctly when drawing cached text Fix BorderImage painting at sizes less than margin size.
| | | * Change pen correctly when drawing cached textAaron Kennedy2010-12-011-0/+8
| | | | | | | | | | | | | | | | Task-number: QTBUG-14568
| | | * Fix BorderImage painting at sizes less than margin size.Martin Jones2010-12-011-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the width < left+right margins or height < top+bottom margins the image was painted with the complete margins, resulting in an ugle pattern. This change reduces the size of the margins proportionately, which gives a much better appearance. Task-number: QTBUG-15736 Reviewed-by: Yann Bodson
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-11-302-5/+6
| | |\ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix resource leak in QEgl::getCompatibleVisualld() Fixed OpenGL state getting out of sync. Fix whitespace in previous 1e7b4e396ec3bacc1a769208b990c5e0450f0d3a Declarative: Fix compiler warnings (Linux/g++)
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Joona Petrell2010-11-3019-309/+620
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/qml/qdeclarativeengine.cpp src/declarative/qml/qdeclarativepropertycache.cpp
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-11-264-5/+9
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed OpenGL state getting out of sync. Fix whitespace in previous 1e7b4e396ec3bacc1a769208b990c5e0450f0d3a Declarative: Fix compiler warnings (Linux/g++)
| | | | * | Fix whitespace in previous 1e7b4e396ec3bacc1a769208b990c5e0450f0d3aFriedemann Kleint2010-11-261-1/+1
| | | | | |
| | | | * | Declarative: Fix compiler warnings (Linux/g++)Friedemann Kleint2010-11-264-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
| * | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-3024-331/+658
| |\ \ \ \ \ | | |/ / / /
| | * | | | Ensure header is considered when positioning content with snapping.Martin Jones2010-11-302-17/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When snapping is enabled the header was ignored and content would be aligned with the first item rather than the header, when at the top of the view. Task-number: QTBUG-15710 Reviewed-by: Bea Lam
| | * | | | Fix integer overflow in QDeclarativeItemPrivate::origin enumerationJoona Petrell2010-11-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-15694 Reviewed-by: Martin Jones
| | * | | | Correct ownership semantics for QObject derived typesAaron Kennedy2010-11-301-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-15697
| | * | | | Correctly handle CppOwnership even when a QDeclarativeData doesn't existAaron Kennedy2010-11-301-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-15695
| | * | | | Don't draw null pixmap in QDeclarativeImage paint functionJoona Petrell2010-11-301-1/+1
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | Task-number: QTBUG-15690 Reviewed-by: Martin Jones
| | * | | Improve consistency in handling of aliases, bindings and value typesAaron Kennedy2010-11-2917-256/+599
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13719
| | * | | Move KeyNavigation example to snippets, plus some doc rewordingBea Lam2010-11-291-51/+21
| | | | |
| * | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-273-2/+3
| |\ \ \ \ | | |/ / /
| | * | | Fix warnings related to unused variables.Thiago Macieira2010-11-262-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just add some Q_UNUSED for parameters or remove the variable we don't need for the others. Reviewed-by: Trust Me
| | * | | Fix silly "will be initialised after" warning.Thiago Macieira2010-11-261-1/+1
| | |/ /
| * | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-263-36/+41
| |\ \ \ | | |/ /
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-11-262-31/+35
| | |\ \
| | | * | Fix type punning warnings from gccAaron Kennedy2010-11-262-31/+35
| | | |/ | | | | | | | | | | | | Also clean up some code uglyness in the process
| | * | Repaint when text color changesAlan Alpert2010-11-261-5/+6
| | |/ | | | | | | | | | | | | Task-number: QTBUG-15623 Reviewed-by: Yann Bodson
| * | Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-252-1/+37
| |\ \ | | |/
| | * End painting of Rectangle pixmap before inserting it to pixmap cache to ↵Joona Petrell2010-11-251-0/+8
| | | | | | | | | | | | | | | | | | | | | avoid an unnecessary copy Task-number: QTBUG-15534 Reviewed-by: Martin Jones
| | * Document KeyEvent::modifiersBea Lam2010-11-251-1/+29
| | | | | | | | | | | | Task-number: QTBUG-15569
* | | Fixed incorrect angle values in the RotationAnimation description.David Boddie2010-11-301-4/+4
|/ / | | | | | | Task-number: QTBUG-15696
* | Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-244-19/+55
|\ \ | |/
| * Flickable and MouseArea were too eager to take/keep mouse grab.Martin Jones2010-11-242-19/+34
| | | | | | | | | | | | | | | | | | This meant that they would sometimes act upon a drag immediately, rather than waiting for a nested area to take the grab. This resulted in a short jump before future events were handled by the nested item. Task-number: QTBUG-15568 Reviewed-by: Bea Lam
| * Allow javascript date and regexp objects in WorkerScript messagesBea Lam2010-11-241-0/+13
| | | | | | | | | | Task-number: QTBUG-14666 Reviewed-by: Aaron Kennedy
| * Avoid lockup in ListView when animating delegates.Martin Jones2010-11-241-0/+8
| | | | | | | | | | | | | | | | | | | | Animating delegates results in the content height changing, which may result in fixup being called if at the ends of the view, which may in turn cause refill to be called, which will change the content height, which repeats. Prevent this recusion from happening. Task-number: QTBUG-14821 Reviewed-by: Bea Lam
* | Doc: Added documentation about Tab and Backtab key handling.David Boddie2010-11-241-1/+23
| | | | | | | | Task-number: QTBUG-15569
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-11-235-7/+12
|\ \ | |/
| * Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-195-7/+12
| |\
| | * Don't leak QML compiled data objectsAaron Kennedy2010-11-193-7/+3
| | | | | | | | | | | | Task-number: QTBUG-14761
| | * Doc: clarify Flickable children vs. contentItem children.Martin Jones2010-11-191-0/+7
| | |
| | * Fix parent bug for QDeclarativeOpenMetaObjectMarco Bubke2010-11-181-0/+2
| | | | | | | | | | | | | | | | | | The dynamic meta object was not called because no parent meta object was called. Reviewed-By: Aaron Kennedy
* | | Doc: Fixed broken link by referring to the errors() method instead.David Boddie2010-11-221-3/+4
|/ / | | | | | | Task-number: QTBUG-15506
generated by cgit v0.12 at 2025-01-27 04:58:09 (GMT)