aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Allow descendant chains to simultaneously be hovered.Alan Alpert2011-08-026-27/+140
| | | | | | | | | | | Matches GV behaviour. Also fixes a bug in QSGMouseArea, which we aren't fixing for QtQuick 1. Task-number: QTBUG-18175 Change-Id: I4ecac7b908504f28de830732c731281407d7b0bc Reviewed-on: http://codereview.qt.nokia.com/2422 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Call base class init() from QSGListViewPrivateBea Lam2011-08-022-5/+13
| | | | | | | | | | | | | | | | Regression from 9b5f9c8056186c9cf3c40dbac66e5f90369339dc when QSGItemView was created. Also fixed other reimplemented methods in QSGListViewPrivate to call their base class functions (which are currently empty) and changed some virtual methods in QSGItemViewPrivate to non-virtual where they didn't need to be virtual. Task-number: QTBUG-20679 Change-Id: I489593b3eab4f5bbb4126906f170342d1e8811cd Reviewed-on: http://codereview.qt.nokia.com/2462 Reviewed-by: Bea Lam <bea.lam@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* Fix broken GridView moved() testBea Lam2011-08-021-6/+6
| | | | | | | | | Test values for moving multiple items were incorrect. Change-Id: I184afee6c44df240ef39450c530ff5991cd591e5 Reviewed-on: http://codereview.qt.nokia.com/2485 Reviewed-by: Bea Lam <bea.lam@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* Nesting PathView and Flickable causes PathView to stop at wrong offsetMartin Jones2011-08-026-0/+36
| | | | | | | | | | | Don't stop current animation until a drag is actually initiated. Also ensure we handle a stolen grab sensibly. Change-Id: I0ad493595fb85e1c9bace2d805184f911341fce2 Fixes: QTBUG-19439 Reviewed-on: http://codereview.qt.nokia.com/2420 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* View highlight could stop tracking currentItem.Martin Jones2011-08-022-5/+17
| | | | | | | | | | | | | This happens if the currentIndex is changed while the view is moving. The only time the highlight should not move to the currentItem is in StrictlyEnforceRange mode when the user is moving the view. Change-Id: I4d04174c88cde180f9f8a01cbd33af3edbcc3d4d Fixes: QTBUG-16936 Reviewed-on: http://codereview.qt.nokia.com/2416 Reviewed-by: Bea Lam <bea.lam@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* Allow custom parser types to still get signal handlers generatedAlan Alpert2011-08-025-1/+27
| | | | | | | | | Specifically, QDeclarativeListModelParser ought to have this behaviour. Task-number: QTBUG-19763 Change-Id: I9d6ee07d1e17a027b254b87d20d1a93795c55744 Reviewed-on: http://codereview.qt.nokia.com/2431 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Don't enable qmlscene compability mode for commented out imports.Andrew den Exter2011-08-021-2/+2
| | | | | | | | | | | Valid import statements should be at the start of a line, maybe preceded by some white space. Task-number: QTBUG-20649 Change-Id: I1944bce0d30e680ebdb0798f5ae4e8c91a057a13 Reviewed-on: http://codereview.qt.nokia.com/2423 Reviewed-by: Martin Jones <martin.jones@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* define for timingGunnar Sletta2011-08-011-0/+13
| | | | | | | Change-Id: Id91e47be0c2706de7871f3492725c577063ae5fb Reviewed-on: http://codereview.qt.nokia.com/2438 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* Add Image changes to whatsnew.qdocYann Bodson2011-08-011-0/+3
| | | | | | Change-Id: Ie197d8a6a927d9250ca975ae602b827fb894f39e Reviewed-on: http://codereview.qt.nokia.com/2415 Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
* Fix Binding to correctly restore bindings even when a binding loop is involved.Michael Brasser2011-08-013-3/+61
| | | | | | Change-Id: Ie8f9731d9f4834d8b94272ef792dc7ad0235ce78 Reviewed-on: http://codereview.qt.nokia.com/2409 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Correctly pause animation when paused in starting ScriptAction.Michael Brasser2011-08-016-2/+48
| | | | | | | Task-number: QTBUG-13598 Change-Id: Ibd54f4e014eff301b57451081b7f7b35d1bed740 Reviewed-on: http://codereview.qt.nokia.com/2408 Reviewed-by: Charles Yin <charles.yin@nokia.com>
* Merge the QJSEngine and QJSValue development branch into master.Simon Hausmann2011-07-29156-515/+17932
| | | | | | | | | | | | This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* Bump the XmlListModel get test import to QtQuick 2.0.Andrew den Exter2011-07-291-1/+1
| | | | | | | Change-Id: I62d65f24fac2b56b7f3efff5dc6e2e9056f53edd Reviewed-on: http://codereview.qt.nokia.com/2383 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Document (lack of) support for sharing animation instances.Michael Brasser2011-07-291-0/+33
| | | | | | | | Task-number: QTBUG-19040 Change-Id: Iacbd16bdf48c95bc9e84cac3bd3f704c35a03707 Reviewed-on: http://codereview.qt.nokia.com/2381 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Ensure bindings on pause work correctly.Michael Brasser2011-07-293-0/+40
| | | | | | | | | | Defer the actual pause, in the same way we defer the actual start. Task-number: QTBUG-19080 Change-Id: I500e5aa6678cbb5321979fda31f60d6d6e19a61e Reviewed-on: http://codereview.qt.nokia.com/2366 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* DocAaron Kennedy2011-07-291-1/+5
| | | | | | | Change-Id: I46c4ec5f41e5a1074d8c01f883409ee439bd09e2 Task-number: QTBUG-19741 Reviewed-on: http://codereview.qt.nokia.com/2368 Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Mark objects from Component.createObject() as destructibleAaron Kennedy2011-07-293-0/+47
| | | | | | | Change-Id: I00a1a2b5cca80c3e2ea097690cadf21581e1356d Task-number: QTBUG-20626 Reviewed-on: http://codereview.qt.nokia.com/2367 Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Fix alias warnings in QDeclarativeCompilerAaron Kennedy2011-07-291-2/+4
| | | | | | | | | Task-number: QTBUG-19736 QTBUG-19693 Change-Id: Ice6b9e0d4f11c75350a3028af5d2479d435d1f69 Reviewed-on: http://codereview.qt.nokia.com/2364 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Fix alias warnings in QV8QObjectWrapperAaron Kennedy2011-07-292-52/+69
| | | | | | | | Task-number: QTBUG-19736 QTBUG-19693 Change-Id: I4f6c56dc4f60224dd79e669099c198b883429f54 Reviewed-on: http://codereview.qt.nokia.com/2363 Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Fix alias warnings in V4Aaron Kennedy2011-07-291-26/+20
| | | | | | | | | Task-number: QTBUG-19736 QTBUG-19693 Change-Id: I6b9c2c167bfe60bcd3c5af7d53ec79c5eec60b74 Reviewed-on: http://codereview.qt.nokia.com/2362 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Fix alias warnings in QDeclarativeVMEAaron Kennedy2011-07-292-32/+73
| | | | | | | | Task-number: QTBUG-19736 QTBUG-19693 Change-Id: Ieab2c7274852b39fc4222132dedc738ab663d4f9 Reviewed-on: http://codereview.qt.nokia.com/2361 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Add sourceComponentChanged signal to LoaderYann Bodson2011-07-294-11/+34
| | | | | | | | | | | When setting the 'sourceComponent' property in Loader, we emit a sourceChanged signal with source == "". We should emit sourceComponentChanged instead. Task-number: QTBUG-20628 Change-Id: If5f8f389b7dc214e729b366d82fe4d32827408ee Reviewed-on: http://codereview.qt.nokia.com/2371 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* 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>