Fix compiler warning in example.

Change-Id: Ie57d6e5c8811a7845c55a069150de2fe0f796599
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Ie11564446e707146f266f384fce794bd34b9d5f7
Prospective build fix after commit f8dbed12266c42785c1e4758eed05833ec035f33 in qtbase

Pass through the QVariant argument provided by the caller (QInputMethod).

Change-Id: Ia99546cd16287c14ce414d6aad0ea04488e7c6e2
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Bump module version to 5.4.0

Change-Id: I49e9b8117f01dfd86f6cdd73509d54575a187f0f
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Dynamic GL support in Quick1's ShaderEffectSource

Not strictly necessary but it is better not to call glEnable()
with values that are not supported by GLES2. This way the
error state will not polluted by an invalid_enum or similar.

Change-Id: I952273f1814d9f124e5c4baa6196386645202439
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
whitespace fixes

remove trailing spaces & expand tabs

Change-Id: Ia088c8cc8a83d068f6e2ec84903b5220cd3411f1
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Ia3d0ffbe6ba6c8c34ec1ca2961953797d82ce282
Fix MSVC-warnings about double to float truncation.

warning C4305: 'argument' : truncation fromm 'double' to 'float'

Change-Id: I7e419700b26ff66c48562b73db74b45ab1673c23
Reviewed-by: Alan Alpert <aalpert@blackberry.com>