Merge pull request #13 from martinjones/master

[PATCH] Dragging MouseArea nested in Flickable does not work with touch ...
[patch] Allow lossless passing of colors in V4

In a binding like

	color: enabled?otherColor:"transparent"

V4 stringifies otherColor on return from the conditional, and
re-colorifies it on assignment.  As the stringified version of
a color lacks the alpha channel, this loses information.

This patch preserves the alpha information in the V4 register
which allows for lossless color->string->color conversions.  If
*any* modification to the intermediate string occurs the alpha
information is discarded.  As the only case V4 will stringify a
color and then immediately re-colorify it without modification
is the passthrough case, this is safe .

This is a reasonably hacky way to fix the initial problem, but it
is also reasonably unintrusive and unlikely to have undesirable
side effects.  As V4 is being discarded in the next release of Qt,
this is the best approach for now.

Fixes QTBUG-32668.
Merge pull request #14 from aaronkennedy/v4color

[patch] Allow lossless passing of colors in V4
[patch] Correctly mark V4 strings as modified

Fixes a bug introduced by 89261c5f0f1cf84fccdc48546b15d9cf12b90608
Merge pull request #15 from aaronkennedy/v4color

[patch] Correctly mark V4 strings as modified
[patch] Cherry-pick e357f015391ac32e8d262b4ea2bd0e3fe1e87fe6

Original commit message:

    Revert "Cut performance cost in QSGContext::prepareMaterial()".

    This reverts commit 0e9cd8b4098661bf611fa73a787c58c85e7d7338.

    This optimization breaks ShaderEffects with changing fragment
    and vertex shaders and needs some more thought.

    Task-number: QTBUG-31837
    Change-Id: I1abe249c65dd785825c249a7c22baee928bd76c8
    Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
Merge pull request #16 from aaronkennedy/master

[patch] Cherry-pick e357f015391ac32e8d262b4ea2bd0e3fe1e87fe6
[patch] Only pass through alpha for #RRGGBB colors

Continuation of 2f26bda597c09f22c085900991d20894ca28b5f5.  The
assert was being hit for colors of the three character form #RGB.
Merge pull request #18 from aaronkennedy/v4color

[patch] Only pass through alpha for #RRGGBB colors
[qtdeclarative] When the MouseArea loses grab, an active drag should be cancelled.
Merge pull request #19 from martinjones/mouse_active

[qtdeclarative] When the MouseArea loses grab, an active drag should be ...
[qtdeclarative] Add displayMarginBeginning/End to ListView and GridView

It is common to need to show content outside the visible area of
the view.
[qtdeclarative] Update viewport size when header/footer size changes.
[patch] Protect QQuickPropertyAnimation::target property

Otherwise if the object is destroyed, reading this property
returns an invalid object.
[patch] Cherry-pick a8b27d974a4ced654a4566b6a9822ed92956a2d2

Original commit message:

    Fix PathView stealing mouse grab from its child items.

    Apply the improvements that have been applied to Flickables handling of
    child items over time to PathView to bring its behavior back in line.

    Task-number: QTBUG-33699
    Change-Id: I76a412d75c48f9cf2f12f5f6f1aa01ff62d06364
    Reviewed-by: Joona Petrell <joona.petrell@jollamobile.com>
    Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
Merge pull request #23 from adenexter/master

[patch] Cherry-pick a8b27d974a4ced654a4566b6a9822ed92956a2d2
Merge pull request #22 from aaronkennedy/jb9521

[patch] Protect QQuickPropertyAnimation::target property
Merge pull request #21 from martinjones/headerfooter_resize

[qtdeclarative] Update viewport size when header/footer size changes.
Avoid copying touchpoints, and only check until we find a match.

Change-Id: I46fad782e93fe1f940acec05f4e1bb4afb5be230
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Fix crash when changing non-cached source of image during animation

Ensure deferred deletions are handled while syncing, otherwise texture
might be deleted after sync but before deferred deletion is processed.

Task-number: QTBUG-32513
Change-Id: Id276f536a5722a36baae815b7b550b574eeeb483
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>