aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Build against refactor.Samuel Rødal2011-07-2952-80/+85
| | | | Change-Id: I0143767405afe968c0aea71651bd9e3dc7a74e23
* Document state fast-forwarding.Michael Brasser2011-07-291-0/+22
| | | | | | | | | Task-number: QTBUG-16049 Change-Id: Ib64cc8ec9396d426e623481a69f5a4a1b0fe5ec5 Reviewed-on: http://codereview.qt.nokia.com/2370 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Document how to have two MouseAreas simultaneously hovered.Michael Brasser2011-07-291-1/+27
| | | | | | | | Task-number: QTBUG-17228 Change-Id: Icfb3774429f0f19084f126a0b87699f1d03220f6 Reviewed-on: http://codereview.qt.nokia.com/2369 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Fix alias warnings in QDeclarativeV8HandleAaron Kennedy2011-07-291-1/+2
| | | | | | | | | Task-number: QTBUG-19736 QTBUG-19693 Change-Id: I1fd1a3146aa7be933f60917a562211142c2460bc Reviewed-on: http://codereview.qt.nokia.com/2360 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Fix alias warnings in QDeclarativeGuardAaron Kennedy2011-07-294-55/+88
| | | | | | | | Task-number: QTBUG-19736 QTBUG-19693 Change-Id: Id3aefe56bc1e33757b8c407f2022b49cc136f00b Reviewed-on: http://codereview.qt.nokia.com/2359 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Correctly set ending path percent if none is provided.Michael Brasser2011-07-293-5/+35
| | | | | | | | Task-number: QTBUG-19818 Change-Id: I5377551d041b593864d56e4449c133deb47d3b45 Reviewed-on: http://codereview.qt.nokia.com/2358 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Clicking on a disabled ListView's delegate breaks mouse interactionMartin Jones2011-07-296-2/+129
| | | | | | | | | | A disabled Flickable should not filter children. Change-Id: I9f0d8fbfd0922b5c6a9eaffa69212867359f79e0 Fixes: QTBUG-20584 Reviewed-on: http://codereview.qt.nokia.com/2354 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Code cleanupAlan Alpert2011-07-291-8/+4
| | | | | | | Change-Id: I97ecc41fcb7255981c863996064cf6d6bae7ebbb Reviewed-on: http://codereview.qt.nokia.com/2356 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Add .arg() for Javascript String typeCharles Yin2011-07-294-1/+47
| | | | | | | | | Change-Id: I973032189c40bfa4d5450396f5bad1a7c81ac68b Task-number:QTBUG-16734 Reviewed-by:Michael Brasser Reviewed-on: http://codereview.qt.nokia.com/2134 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* XmlListModel.status is Ready right after creation (should be Null)Charles Yin2011-07-292-3/+12
| | | | | | | | | | | And whenever both the source the xml properties are empty, the status should be Null as well. Change-Id: I62936d9389b524833422a871b596b99cc93cc734 Task-number:QTBUG-18724 Reviewed-by:Michael Brasser Reviewed-on: http://codereview.qt.nokia.com/2231 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* remove motionchart demo (uncompleted)Charles Yin2011-07-291-140/+0
| | | | | | | Change-Id: I4e6b068ca9ceb0b7f76a6548d1b7a8789bc4bf39 Reviewed-on: http://codereview.qt.nokia.com/2237 Reviewed-by: Charles Yin <charles.yin@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* Jump to same model index (if it exists) when the model changesAlan Alpert2011-07-291-1/+4
| | | | | | | | | | For PathView, ListView does this already. Task-number: QTBUG-19059 Change-Id: Id09087ad372e46661794b0cb15cb30fc88802c4b Reviewed-on: http://codereview.qt.nokia.com/2330 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Augment SpringAnimation::damping documentationAlan Alpert2011-07-291-3/+5
| | | | | | | | | Task-number: QTBUG-20120 Change-Id: Ifaa0e7eaa0f61052680338a6cfd35bb6aca63157 Reviewed-on: http://codereview.qt.nokia.com/2333 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Document stops as default property of GradientAlan Alpert2011-07-291-0/+2
| | | | | | | | | | | This will hopefully be copied to the QtQuick2 item when we write docs for them. Task-number: QTBUG-16045 Change-Id: I427b468630b59bd4bd6eca907ab12a66ee219d29 Reviewed-on: http://codereview.qt.nokia.com/2320 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Renamed ShaderEffectItem to ShaderEffect and some API changes.Kim Motoyoshi Kalland2011-07-2816-154/+211
| | | | | | | | | | | | | | | | The ShaderEffectItem was renamed to ShaderEffect to be consistent with other QML element names. The GLSL uniform variable qt_ModelViewProjectionMatrix was renamed to qt_Matrix which is easier to type and remember. The GridMesh element was removed. The mesh resolution is now specified simply with a QSize. To make the transition easier, the old API will continue to work for some time, but will output warnings if used. Eventually, I will remove the old API completely. Change-Id: Iec4f2aa624a2c76a7db6750c58f73dbcb316ab6a Reviewed-on: http://codereview.qt.nokia.com/2270 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* compile when qreal is a floatGunnar Sletta2011-07-281-1/+1
| | | | | | Change-Id: I1e5c592f1cacb0a3a80e15b53011efb134db29f7 Reviewed-on: http://codereview.qt.nokia.com/2336 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Clip to bounding rectAlan Alpert2011-07-284-4/+5
| | | | | | | | | | | | | Bounding rect varies from width/height in some cases, like Rectangle. This restores rectangle clipping behaviour to be the same as QtQuick 1. Task-number: QTBUG-20547 Change-Id: I2b6edc662a0026219d73b52878d2f4c046fef7f0 Reviewed-on: http://codereview.qt.nokia.com/2317 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Add some more properties to JS particle typeAlan Alpert2011-07-2815-85/+141
| | | | | | | | | | | Adds the current position, velocity and acceleration. While we're at it, renaming the velocity vars from sx,sy to vx,vy Change-Id: I87f582169c7873c45a6fd453052b25c4dc940f3e Reviewed-on: http://codereview.qt.nokia.com/2021 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Initial CustomEmitter and CustomAffector implementationAlan Alpert2011-07-2823-7/+911
| | | | | | | | Currently basic and can't access all properties. Change-Id: I66efc235112cffcf1a3ca5cc69099a5d09ec7691 Reviewed-on: http://codereview.qt.nokia.com/1950 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Allow Qt enum values in ListElement.Michael Brasser2011-07-282-3/+14
| | | | | | | | | Task-number: QTBUG-16547 Change-Id: Id215cea5cdaaaef8ff8a06a0bde682f95c91e416 Reviewed-by: Aaron Kennedy Reviewed-on: http://codereview.qt.nokia.com/2227 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Support QT_TRANSLATE_NOOP in ListElement.Michael Brasser2011-07-282-9/+77
| | | | | | | | Task-number: QTBUG-16289 Change-Id: I13e6859de185478e2c6c9486d8deeda103dd7b90 Reviewed-on: http://codereview.qt.nokia.com/2238 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Fix translation context for QML files.Michael Brasser2011-07-285-2/+37
| | | | | | | | | | | Use the base file name as done in QtQuick 1, rather than using the entire path. This also fixes QTBUG-17255 for QtQuick 2. Change-Id: Ia27f6539f82d6caf6e7060b89ff1996d42ffb9cb Reviewed-on: http://codereview.qt.nokia.com/2246 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Remove reference to deleted file.Michael Brasser2011-07-281-1/+0
| | | | | | | Change-Id: Ie75506c5a9d61eb50e7e2f1027b72e1c041200a9 Reviewed-on: http://codereview.qt.nokia.com/2249 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* BorderImage inner rect should have a positive sizeYann Bodson2011-07-281-2/+2
| | | | | | | | Task-number: QTBUG-19527 Change-Id: I7cba15cc8ca4679d92f2e456ed95629702ea27a1 Reviewed-on: http://codereview.qt.nokia.com/2322 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
* Don't jump around when maximumEasingTime is specifiedAaron Kennedy2011-07-282-15/+18
| | | | | | | | | Task-number: QTBUG-20436 Change-Id: I477c42d55e712e141403b3a95d1c9b0685df5f0d Reviewed-on: http://codereview.qt.nokia.com/2240 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Fix bug 20505: Offline Storage API: wrong types of row fieldsCharles Yin2011-07-282-2/+26
| | | | | | | | | | fields types should be returned as same as defined, not strings. Change-Id: I9a0d03acb79850e93cc9266e2595ee61af2089a0 Task-number:QTBUG-20505 Reviewed-on: http://codereview.qt.nokia.com/2065 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Fix auto-repeat key navigation for GridViewBea Lam2011-07-283-1/+56
| | | | | | | | | | | | | Shouldn't set moveReason=SetIndex in key navigation. ListView didn't do this in its keyPress implementation. Added extra tests for GridView and ListView. Task-number: QTBUG-20408 Change-Id: Iaf0f331d3ba4f037c5bbc0a41418dd656b5a3695 Reviewed-on: http://codereview.qt.nokia.com/2318 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* ListView doesn't show new 1st item currentItem is removed.Martin Jones2011-07-286-40/+54
| | | | | | | | | | | | | If the new 1st item becomes the currentItem after removal it was positioned incorrectly because the currentItem is positioned based on visibleIndex, which was updated after the currentItem was updated. Move visibleIndex update before currentItem update. Change-Id: Iaf92a41eefe7bce093e3000d17f5496dba144bcd Fixes: QTBUG-20575 Reviewed-on: http://codereview.qt.nokia.com/2316 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Add dragging properties to FlickableMartin Jones2011-07-285-3/+226
| | | | | | | | | | | | This allows the user to determine when a movement is due to the user dragging the view directly, i.e. excluding any flick that occurs after the touch is released. Change-Id: Idf4b699946f808da6fa34ec21a3d2cb2f0ec9de6 Fixes: QTBUG-19685 Reviewed-on: http://codereview.qt.nokia.com/2310 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Manage m_activeCount centrallyAlan Alpert2011-07-282-8/+7
| | | | | | | | | | | | Fixes issue where it wasn't being managed right and kept going negative. This commit also adds setVisible in a few places missed by the last change. Task-number: QTBUG-20437 Change-Id: I4efaab7b34784dfbc42dd1acd0a5be3b38a8605a Reviewed-on: http://codereview.qt.nokia.com/2074 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Remove forwardTo codeAlan Alpert2011-07-283-26/+0
| | | | | | | | | Committed by accident but slipped through the cracks somehow. Change-Id: I64f172e5615de439987438b9300077e79503174e Reviewed-on: http://codereview.qt.nokia.com/2135 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Drive ParticleSystem with an animation insteadAlan Alpert2011-07-284-62/+112
| | | | | | | | | This will be helpful later, and also keeps the work in the main thread. Change-Id: Idf4b9e82a40f31a0b70edda731b85b6c853a1dac Reviewed-on: http://codereview.qt.nokia.com/1909 Reviewed-by: Alan Alpert <alan.alpert@nokia.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Fix moving of multiple items, and moving items backwardsBea Lam2011-07-286-18/+159
| | | | | | | | | | | | | | To fix backward movements, all backward movements are now flipped into forward movements (as is done in ListModel implemenation). Movement of multiple items wasn't working as views weren't removing the right indexes in these cases. Task-number: QTBUG-19208 Change-Id: I9866ddabc241c066bb77329a6761d500d79aaf61 Reviewed-on: http://codereview.qt.nokia.com/2262 Reviewed-by: Bea Lam <bea.lam@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* Fix XmlHttpRequest setHeader bugCharles Yin2011-07-2814-14/+64
| | | | | | | | | | | Setting XMLHttpRequest raw header makes header name uppercase, the name should be kept as it is. Task-number:QTBUG-20472 Change-Id: I8aa8988d6d18d71ee71a7d2f9c3246b20f006f3c Reviewed-on: http://codereview.qt.nokia.com/2225 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Delete scene if you aren't going to use it.Alan Alpert2011-07-287-8/+31
| | | | | | | | | | Also make QDeclarativeOpenMetaObjectType zero its engine when the engine dies, because this was leading to problems when the scene wasn't deleted. Also fixes a few other potential deletion problems. Change-Id: I37fa2d1a0b438a6ea7d8cf4c5c9d0bd869faa959 Reviewed-on: http://codereview.qt.nokia.com/2250 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* A change in ListView's header height can cause it to overlap the itemsMartin Jones2011-07-282-2/+33
| | | | | | | | | | | If there are no visibleItems the header has no choice but to set visiblePos to a value after itself. Change-Id: I7748db46272989e421eeca88577b6fcf79814b5b Fixes: QTBUG-19844 Reviewed-on: http://codereview.qt.nokia.com/2254 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Fix insertion of one item in ListView.Martin Jones2011-07-283-1/+17
| | | | | | | | | | Off-by-one meant that the item was not created by the ListView. Change-Id: If9658487a615e189c21c419e4d29e7e709e05cef Fixes: QTBUG-19675 Reviewed-on: http://codereview.qt.nokia.com/2251 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Bea Lam <bea.lam@nokia.com>
* The views have many +/- 1 which are causing errors.Martin Jones2011-07-284-58/+50
| | | | | | | | | | | Remove them all. endPosition() etc. now refer to the position() + size() rather than position() + size() - 1. Change-Id: I6ddf98def39971ee2e2c3c2d0a1df97781290782 Fixes: QTBUG-20020 Reviewed-on: http://codereview.qt.nokia.com/2243 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Bea Lam <bea.lam@nokia.com>
* View highlight flickers with highlightRangeMode: ApplyRangeMartin Jones2011-07-283-12/+9
| | | | | | | | | | | | The view position was alternating between the start and end of the highlight range if the range < delegate size. Now favor the range start in this case, as per StrictlyEnforceRange. Change-Id: Icb895f972ccb9598ecf7238259093584c43ae291 Fixes: QTBUG-18067 Reviewed-on: http://codereview.qt.nokia.com/2226 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Fix crash when a model defines its own modelData role.Andrew den Exter2011-07-282-8/+29
| | | | | | | | | | | Don't create a duplicate modelData property if one has already been created from the model's roles. Task-number: QTBUG-18801 Change-Id: Ic46763a9dc067cfb53b0655d991c553b3b10f023 Reviewed-on: http://codereview.qt.nokia.com/2312 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Update ListModel's internal indexes when items are inserted/removed.Andrew den Exter2011-07-282-1/+41
| | | | | | | | | | | | The changed signals of cached items were being emitted with incorrect indexes if a previous item in the list was inserted or removed, resulting in changes not being reflected in views. Task-number: QTBUG-20286 Change-Id: Id2fb8e2875c6cbd4f2e4d14ef859b7a7a4bac8d9 Reviewed-on: http://codereview.qt.nokia.com/2252 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Don't clip the cursor at the far right of a TextInput.Andrew den Exter2011-07-282-45/+32
| | | | | | | | | | | | | | The cursor is allowed to exceed the boundaries of a TextInput so that the text alignment is consistent with the Text element and the bounding rect of TextInput is expanded to allow for that. To avoid clipping the contentSize also needs to be expanded, and the horizontal scrolling should be calculated against the non-expanded size. Task-number: QTBUG-18818 Change-Id: I09e3a7aff9c2e8a333e8a3f9796683563b3e124a Reviewed-on: http://codereview.qt.nokia.com/2242 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Fix positioning of items after moveBea Lam2011-07-284-107/+274
| | | | | | | | | | | | | | | | | | | | | | If a move happened after a contentY change but before a refill, the position of the first visible item wasn't calculated correctly. If the first item from visibleItems was above the content start position and a move operation caused the items below it to move away, this first item was not being moved to the correct position (i.e. above the next available visible item) causing the following visible items to be positioned incorrectly on the next refill. ListView supported this previously but only adjusted positioning for items before the content position, instead of for all moved items. Fixed for both ListView and GridView and added more move-related tests. Task-number: QTBUG-20528 Change-Id: I2ba1a2f5e49f790e694c6e1486f649f10d09c256 Reviewed-on: http://codereview.qt.nokia.com/2261 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Don't move view content position item 0 is being replacedBea Lam2011-07-284-3/+93
| | | | | | | | | | | Usually if item 0 moves down, the next item becomes the first visible item and all content moves down. Don't do this if another item is moving up to take its place. Change-Id: If625cfc0eaa70fd1094c7bc0fdd29f5f56766a42 Reviewed-on: http://codereview.qt.nokia.com/2260 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* increase the tryCompare timeout value to make the CI happyCharles Yin2011-07-281-3/+3
| | | | | | | Change-Id: I9561213295969f3064637584f45deb66f56c071b Reviewed-on: http://codereview.qt.nokia.com/2309 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Charles Yin <charles.yin@nokia.com>
* fix canvas arc drawing bugCharles Yin2011-07-271-4/+4
| | | | | | | | Task-number:QTBUG-20523 Change-Id: I6ff71c12ffb66407cc5bbb4783e4c957ab740ac7 Reviewed-on: http://codereview.qt.nokia.com/2068 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Charles Yin <charles.yin@nokia.com>
* polish canvas stock chart exampleCharles Yin2011-07-2722-61/+601
| | | | | | Change-Id: Ie79859af8572c3c79185d98c54c2aae35190d257 Reviewed-on: http://codereview.qt.nokia.com/1908 Reviewed-by: Charles Yin <charles.yin@nokia.com>
* put all context2d code into context2d directoryCharles Yin2011-07-278-6/+14
| | | | | | | Change-Id: I38442c8d2bcb9f2dcaa433b6bcfd7dbc21439f63 Reviewed-on: http://codereview.qt.nokia.com/1907 Reviewed-by: Charles Yin <charles.yin@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* Fix Column/Row size when no items being positionedAlan Alpert2011-07-273-5/+70
| | | | | | | Change-Id: I0bf55c13e55856dd7292e5eda159086096dea86b Reviewed-on: http://codereview.qt.nokia.com/2158 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Document view touch interaction with their content.Martin Jones2011-07-271-0/+13
| | | | | | | | Fixes: QTBUG-18601 Change-Id: I9e793fa205d0eb2f2c312a9a73559720a4d4f00a Reviewed-on: http://codereview.qt.nokia.com/2223 Reviewed-by: Martin Jones <martin.jones@nokia.com>