Merge remote-tracking branch 'origin/5.4' into dev

Change-Id: I5575a4ba13212c9bfe73a3de3ef17c6528beafc3
2015-02-13 13:10:48 +01:00
parent bbfccc7135 06259f1dfb
commit f9014d136f
27 changed files with 128468 additions and 29717 deletions
--- a/src/imports/multimedia/qdeclarativecamera.cpp
+++ b/src/imports/multimedia/qdeclarativecamera.cpp
@@ -925,7 +925,7 @@ void QDeclarativeCamera::setDigitalZoom(qreal value)
    \qmlproperty variant QtMultimedia::Camera::metaData.gpsLongitude
    \qmlproperty variant QtMultimedia::Camera::metaData.gpsAltitude

-    These properties hold the the geographic position in decimal degrees of the
+    These properties hold the geographic position in decimal degrees of the
    camera at time of capture.

    \sa {QMediaMetaData}