Fix "conversion from 'double' to 'float'" warnings on MSVC2010.

Change-Id: I209d76fa2d87ad2eb540c750b8c4efb865441aae
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Android: fix plugin json metadata.

Change-Id: I0f2feca44843760df13a938d9190daf2d447d645
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
Android: Make sure the OpenSL plugin is included on Android.

Change-Id: Ic46dd8afe50250bb30754ce12eda57138d05b81d
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
VideoOutput: take the video format's scanLineDirection into account.

Task-number: QTBUG-30442
Change-Id: Ic950d66cb35a937ccf3862089e0060819b6d6f34
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
Fix lupdate warning in playlistparser.

playlistfileparser.cpp:278: Class 'PLSParser' lacks Q_OBJECT macro.

Change-Id: I062bd90b7cd5de82683dc02c6a6400855982a163
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Ia74aa63894bcbe2641590f18e8171d0c677ece12
Added missing camera error strings

On BlackBerry some camera error codes were not mapped to
corresponding strings.

Change-Id: I3c26f07eccc7204b89a387e83d342f6821773a1b
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev