Merge branch 'master' into refactor

Conflicts:
src/declarative/declarative.pro
src/imports/gestures/gestures.pro
src/imports/inputcontext/inputcontext.pro
src/qtquick1/graphicsitems/qdeclarativeitem.cpp
src/qtquick1/qtquick1.pro

Change-Id: I782be7090d8b6da9c890bc8e778722da93da8037

improved debug messages a bit

Change-Id: I2f1d90faba1fe508b7638b857b9803e0281de5d4
Reviewed-on: http://codereview.qt.nokia.com/2826
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>

Implement VBO caching of larger geometries

Change-Id: If87b70b191a06448287b47d252a288b441af6302
Reviewed-on: http://codereview.qt.nokia.com/2784
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Yoann Lopes <yoann.lopes@nokia.com>

Removed faked resize / show / hide events.

Change-Id: I441af093ffc394101cc38486472dd1af0957994f
Reviewed-on: http://codereview.qt.nokia.com/2742
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>

Remove the QGLContext from QSGCanvas

Change-Id: I6ad95d05d9874704b038943f7887611315733c89
Reviewed-on: http://codereview.qt.nokia.com/2678
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>

Ported use of QInputContext to QPlatformInputContext for now

Change-Id: I2e0e62cffd04c3a096d1402028a9be92d8b0a27c
Reviewed-on: http://codereview.qt.nokia.com/2677
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>

got canvas rendering...

Change-Id: Ifefda68628d489fef47684742db9adece7d15683
Reviewed-on: http://codereview.qt.nokia.com/2676
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>

Make QSGCanvas a QWindow instead of a QGLWidget

Change-Id: I71a04f61acff893a35c00204ed11bdf852830485
Reviewed-on: http://codereview.qt.nokia.com/2675
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>

Compile with refactor

Change-Id: I41119370bd4823dcdfe5d4e2521d18b8d6ba8be3
Reviewed-on: http://codereview.qt.nokia.com/2417
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>

Add Image changes to whatsnew.qdoc

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.

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.

Task-number: QTBUG-13598
Change-Id: Ibd54f4e014eff301b57451081b7f7b35d1bed740
Reviewed-on: http://codereview.qt.nokia.com/2408
Reviewed-by: Charles Yin <charles.yin@nokia.com>

Build against refactor.

Change-Id: I0143767405afe968c0aea71651bd9e3dc7a74e23

Merge the QJSEngine and QJSValue development branch into 

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.

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.

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.

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>

Doc

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 destructible

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 QDeclarativeCompiler

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 QV8QObjectWrapper

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 V4

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 QDeclarativeVME

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 Loader

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.

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.

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 QDeclarativeV8Handle

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 QDeclarativeGuard

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.

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 interaction

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 cleanup

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 type

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)

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)

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 changes

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 documentation

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 Gradient

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.

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 float

Change-Id: I1e5c592f1cacb0a3a80e15b53011efb134db29f7
Reviewed-on: http://codereview.qt.nokia.com/2336
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>

Clip to bounding rect

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 type

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 implementation

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.

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.

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.

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.

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 size

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 specified

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 fields

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 GridView

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.

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 Flickable

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 centrally

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 code

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 instead

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 backwards

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 bug

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.

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 items

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.

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.

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: ApplyRange

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.

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.

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.

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 move

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 replaced

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 happy

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 bug

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 example

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 directory

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 positioned

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.

Fixes: QTBUG-18601

Change-Id: I9e793fa205d0eb2f2c312a9a73559720a4d4f00a
Reviewed-on: http://codereview.qt.nokia.com/2223
Reviewed-by: Martin Jones <martin.jones@nokia.com>

Don't build V8 as a static library

In the future, we'll need to be able to export the V8
symbols from the QtDeclarative library, which requires
compiling V8 straight in. It's not possible to achieve
this using a static library.

Change-Id: Ie9e31984d2c03639a311cef11ddd33ba0aa15fd9
Reviewed-on: http://codereview.qt.nokia.com/2187
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>

A long press should allow onClicked if there is no onPressAndHold

Fixes: QTBUG-19726

Change-Id: I896c9264c1cf408dcd533b5d6d463d53c785d787
Reviewed-on: http://codereview.qt.nokia.com/2155
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>

Fix crash when assigning a list property to transitions.

This fixes the crash, but doesn't actually assign any
Transitions (the transitions list will now be empty, rather
than contain a null Transition object). Correct assignment
is a general language issue, and will be fixed separately.

Task-number: QTBUG-20227
Change-Id: Ie224d06b1d8bb82d03c5eba378affb7167f08724
Reviewed-by: Alan Alpert
Reviewed-on: http://codereview.qt.nokia.com/2152
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>

Cleanup QMLViewer properly when exiting via File->Quit.

Task-number: QTBUG-14972
Change-Id: I9b8738fe0ae94a1bbed7427f137a6ab5c7a8ff86
Reviewed-on: http://codereview.qt.nokia.com/2154
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Charles Yin <charles.yin@nokia.com>

Add headerItem and footerItem properties to views.

Fixes: QTBUG-19684

Change-Id: Iea7d4a4f902cc45cb0cca8e1221fdb993f0bebd2
Reviewed-on: http://codereview.qt.nokia.com/2151
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bea Lam <bea.lam@nokia.com>

qmlviewer resizes the root object multiple times.

In SizeRootObjectToView mode on initial load the view was set to
root object size, then the sceneResized() slot would resize back,
then we would finally reset back to the correct value in
statusChanged(true).  Now react directly to the initial size being
set.

Change-Id: Ib6977cf7bad3fe79b9ac80bb6d916fb0f57c5f5e
Fixes: QTBUG-16499
Reviewed-on: http://codereview.qt.nokia.com/2148
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>

Update PhotoViewer to QtQuick 2.0

Seems to work fine.

Change-Id: I2da6487a6b3a5dc9ce1fb2036450ef0a0588430f
Reviewed-on: http://codereview.qt.nokia.com/2149
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>

QDeclarativeView/QSGView SizeRootObjectToView still resizes view

Only resize view to object in SizeRootObjectToView if the view
has not had a size set, i.e. at initial construction.

Change-Id: Ic5ad3cbb3b071c3498047be893da2c7bf0957986
Fixes: QTBUG-15863
Reviewed-on: http://codereview.qt.nokia.com/2132
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>

Use visible only, and not opacity, in positioners

Task-number: QTBUG-12940

Change-Id: Id637bbd7c30aea8bc23c2aeaccfb069a8de7955f
Reviewed-on: http://codereview.qt.nokia.com/2082
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>

Remove onMousePositionChanged signal.

This signal was meant to be "private" (not directly used from QML).
Provide separate signals for onMouseXChanged and onMouseYChanged.

Task-number: QTBUG-18656
Change-Id: Iefc3d78e270db9c037bbb1b890925b4841f2d5fa
Reviewed-by: Martin Jones
Reviewed-on: http://codereview.qt.nokia.com/2142
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>

Reference resources to prevent crash (on some platforms)

Prevent the data blob from being deleted in done().

Task-number: QTBUG-18268

Change-Id: Ib265e6fc3e1539d0baf20e365c1f88f615b121dc
Reviewed-on: http://codereview.qt.nokia.com/2138
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>

Autotest

Task-number: QTBUG-16878

Change-Id: I0d074c13b32670697f4811060ddf4edbdf6c6451
Reviewed-on: http://codereview.qt.nokia.com/2133
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>

Ouptut non-NOTIFYable warnings again

Task-number: QTBUG-20280

Change-Id: Ia950c8c9dfa14e568a306beeb72474b2d5049db1
Reviewed-on: http://codereview.qt.nokia.com/2069
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>

Update polish even when animations aren't running

Task-number: QTBUG-20078

Change-Id: I095a872d72da61248794ec4a2a85f91ee618cdbc
Reviewed-on: http://codereview.qt.nokia.com/2063
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>

Move the cursor position to the end when TextInput.readOnly is cleared.

Improves consistency with TextEdit.

Task-number: QTBUG-18747
Change-Id: Ieb0a332441557fc6ba4c5ddaafea5c634aff1ee4
Reviewed-on: http://codereview.qt.nokia.com/2131
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>

Bounding rectangle for image is wrong for PreserveAspectCrop

Task-number: QTBUG-20300
Change-Id: I8aa84ec64f7be536e56cdc1c04a6c2f204e06c26
Reviewed-on: http://codereview.qt.nokia.com/1859
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>

Fixes AnimatedImage documentation

Animated images are not cached or shared internally.

Task-number: QTBUG-14847
Change-Id: I0b9362a4ff9299b4c18057fb6f005925386f48d1
Reviewed-on: http://codereview.qt.nokia.com/2143
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>

Crash even less

Should not set pointer to zero if we're going to use it again.

Task-number: QTBUG-20407
Change-Id: Iea1ea879bf3fe53e2e8ac8d93648ab28a0fc7b12
Reviewed-on: http://codereview.qt.nokia.com/2064
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>

Don't error if response results in UnknownContentError

XMLHttpRequest specs state that only 'network errors' should result
in a request error, and a HTTP response like 400 Bad Request (which
results in QNetworkReply::UnknownContentError) is an indication of the
HTTP server response rather than a network error.

Task-number: QTBUG-20146
Change-Id: I10c132788200e15b0362da839689a0bb3c2b4a0d
Reviewed-on: http://codereview.qt.nokia.com/1915
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>

Autotest

Task-number: QTBUG-16026

Change-Id: Iafcd0ae99016ea684c162e54da1090417f781790
Reviewed-on: http://codereview.qt.nokia.com/2089
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>

Correct TextInput.PasswordEchoOnEdit documentation.

The documentation incorrectly stated that this mode masked all but
the last character, the actual behavior is as described in the
QLineEdit documentation.

Task-number: QTBUG-20003

Change-Id: I8a89a6818c930125821435bc04121340968dfbb2
Reviewed-on: http://codereview.qt.nokia.com/2067
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>

Set classname for cloned extension meta objects

Task-number: QTBUG-16273

Change-Id: I33c6e2985caba8e506312ddb9007aaea3d00befd
Reviewed-on: http://codereview.qt.nokia.com/2087
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>

Reverse lookup ids by object pointer

Task-number: QTBUG-18554

Change-Id: Ia4effb629d19aa36b835f6c09a63d9495e5c26e7
Reviewed-on: http://codereview.qt.nokia.com/2079
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>

Scroll correctly when cursorPosition is changed within onTextChanged.

Emit textChanged() before adjusting size and scroll positions otherwise
the calculations will be based on the cursor position before it's moved
in handler and because the cursor position won't ultimately have changed
there won't be a follow up cursorPositionChanged() signal to trigger a
second set of calculation.

Task-number: QTBUG-19912
Reviewed-by: Martin Jones
(cherry picked from commit bb11b53bedb8e239b9439b4a3fc3320e35c2de57)

Conflicts:

src/declarative/graphicsitems/qdeclarativetextinput.cpp

Change-Id: I579bc3fe6c80766dfadfbc9dbd46144607bf7b03
Reviewed-on: http://codereview.qt.nokia.com/2058
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>

Use engine where appropriate in QDeclarativeProperty

Task-number: QTBUG-14697

Change-Id: Id15def75271666699b1fe23e39991710afebff59
Reviewed-on: http://codereview.qt.nokia.com/2077
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>

Only manage opacity when m_fade is true

In all cases, visualize lifecycle with 'visible' property instead.

Task-number: QTBUG-20438
Change-Id: Ib0b732708e14ad043c5b673205eaec0467e38174
Reviewed-on: http://codereview.qt.nokia.com/2071
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>

Allow object to be accessed by multiple QDeclarativeEngines

Task-number: QTBUG-18610

Change-Id: Idd9444018b5344586d6579ddac6a0ffd26bf7139
Reviewed-on: http://codereview.qt.nokia.com/2075
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>