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

Conflicts:
	src/multimedia/doc/qtmultimedia.qdocconf
	src/plugins/blackberry/mediaplayer/bbmetadata.cpp
	src/plugins/blackberry/mediaplayer/bbmetadata.h
	tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp

Change-Id: I447c297ea15a94d1d2feb0fb5f9edac8c5d4505a

10 files changed, 20 insertions, 20 deletions

diff --git a/src/multimedia/camera/qcamera.cpp b/src/multimedia/camera/qcamera.cpp
index 1746d48ab..5b0f0d10d 100644
--- a/src/multimedia/camera/qcamera.cpp
+++ b/src/multimedia/camera/qcamera.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the Qt Toolkit.
@@ -90,7 +90,7 @@ QT_BEGIN_NAMESPACE
 
     See the \l{Camera Overview}{camera overview} for more information.
 
-    \snippet doc/src/snippets/multimedia-snippets/media.cpp Request control
+    \snippet multimedia-snippets/media.cpp Request control
 
 */
 
@@ -180,7 +180,7 @@ void QCameraPrivate::setState(QCamera::State newState)
     unsetError();
 
     if (!control) {
-        _q_error(QCamera::ServiceMissingError, q_ptr->tr("The camera service is missing"));
+        _q_error(QCamera::ServiceMissingError, QCamera::tr("The camera service is missing"));
         return;
     }
 
diff --git a/src/multimedia/camera/qcamera.h b/src/multimedia/camera/qcamera.h
index 5cda4551d..6a29b2c86 100644
--- a/src/multimedia/camera/qcamera.h
+++ b/src/multimedia/camera/qcamera.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the Qt Toolkit.
diff --git a/src/multimedia/camera/qcameraexposure.cpp b/src/multimedia/camera/qcameraexposure.cpp
index 0bc98a04c..4385cd4a4 100644
--- a/src/multimedia/camera/qcameraexposure.cpp
+++ b/src/multimedia/camera/qcameraexposure.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the Qt Toolkit.
diff --git a/src/multimedia/camera/qcameraexposure.h b/src/multimedia/camera/qcameraexposure.h
index 4be10f25f..ba8e25cb7 100644
--- a/src/multimedia/camera/qcameraexposure.h
+++ b/src/multimedia/camera/qcameraexposure.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the Qt Toolkit.
diff --git a/src/multimedia/camera/qcamerafocus.cpp b/src/multimedia/camera/qcamerafocus.cpp
index fcae9f0c5..cae285167 100644
--- a/src/multimedia/camera/qcamerafocus.cpp
+++ b/src/multimedia/camera/qcamerafocus.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the Qt Toolkit.
@@ -162,7 +162,7 @@ public:
     rectangles around areas of the camera frame that are in focus, or changing the
     color of a zone as it comes into focus.
 
-    \snippet doc/src/snippets/multimedia-snippets/camera.cpp Camera focus zones
+    \snippet multimedia-snippets/camera.cpp Camera focus zones
 
     \sa QCameraFocus
 */
@@ -291,7 +291,7 @@ void QCameraFocusZone::setStatus(QCameraFocusZone::FocusZoneStatus status)
     interesting area of the viewfinder for the hardware to attempt
     to focus on.
 
-    \snippet doc/src/snippets/multimedia-snippets/camera.cpp Camera custom zoom
+    \snippet multimedia-snippets/camera.cpp Camera custom zoom
 
     Zooming can be accomplished in a number of ways - usually the more
     expensive but higher quality approach is an optical zoom, which allows
@@ -303,7 +303,7 @@ void QCameraFocusZone::setStatus(QCameraFocusZone::FocusZoneStatus status)
     checked.  The \l zoomTo() method allows changing both optical and
     digital zoom at once.
 
-    \snippet doc/src/snippets/multimedia-snippets/camera.cpp Camera combined zoom
+    \snippet multimedia-snippets/camera.cpp Camera combined zoom
 
     \section2 Some notes on autofocus
     Some hardware supports a movable focus lens assembly, and typically
@@ -319,7 +319,7 @@ void QCameraFocusZone::setStatus(QCameraFocusZone::FocusZoneStatus status)
     are in focus or are being used for autofocusing via the \l focusZones()
     property:
 
-    \snippet doc/src/snippets/multimedia-snippets/camera.cpp Camera focus zones
+    \snippet multimedia-snippets/camera.cpp Camera focus zones
 
     \sa QCameraFocusZone
 */
diff --git a/src/multimedia/camera/qcamerafocus.h b/src/multimedia/camera/qcamerafocus.h
index 9f1dfb73b..675ae2ea3 100644
--- a/src/multimedia/camera/qcamerafocus.h
+++ b/src/multimedia/camera/qcamerafocus.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the Qt Toolkit.
diff --git a/src/multimedia/camera/qcameraimagecapture.cpp b/src/multimedia/camera/qcameraimagecapture.cpp
index 1fd8810fc..0471ef3b0 100644
--- a/src/multimedia/camera/qcameraimagecapture.cpp
+++ b/src/multimedia/camera/qcameraimagecapture.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the Qt Toolkit.
@@ -69,9 +69,9 @@ QT_BEGIN_NAMESPACE
     It's not intended to be used alone but for accessing the media
     recording functions of other media objects, like QCamera.
 
-    \snippet doc/src/snippets/multimedia-snippets/camera.cpp Camera
+    \snippet multimedia-snippets/camera.cpp Camera
 
-    \snippet doc/src/snippets/multimedia-snippets/camera.cpp Camera keys
+    \snippet multimedia-snippets/camera.cpp Camera keys
 
     \sa QCamera
 */
diff --git a/src/multimedia/camera/qcameraimagecapture.h b/src/multimedia/camera/qcameraimagecapture.h
index 91099ab7b..1ebcfec8a 100644
--- a/src/multimedia/camera/qcameraimagecapture.h
+++ b/src/multimedia/camera/qcameraimagecapture.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the Qt Toolkit.
diff --git a/src/multimedia/camera/qcameraimageprocessing.cpp b/src/multimedia/camera/qcameraimageprocessing.cpp
index 45c8baf38..7df222458 100644
--- a/src/multimedia/camera/qcameraimageprocessing.cpp
+++ b/src/multimedia/camera/qcameraimageprocessing.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the Qt Toolkit.
@@ -87,11 +87,11 @@ QT_BEGIN_NAMESPACE
     For example, you can set the white balance (or color temperature) used
     for processing images:
 
-    \snippet doc/src/snippets/multimedia-snippets/camera.cpp Camera image whitebalance
+    \snippet multimedia-snippets/camera.cpp Camera image whitebalance
 
     Or adjust the amount of denoising performed:
 
-    \snippet doc/src/snippets/multimedia-snippets/camera.cpp Camera image denoising
+    \snippet multimedia-snippets/camera.cpp Camera image denoising
 
     In some cases changing these settings may result in a longer delay
     before an image is ready.
diff --git a/src/multimedia/camera/qcameraimageprocessing.h b/src/multimedia/camera/qcameraimageprocessing.h
index e2fa4d58f..ffb088f3d 100644
--- a/src/multimedia/camera/qcameraimageprocessing.h
+++ b/src/multimedia/camera/qcameraimageprocessing.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the Qt Toolkit.