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

15 files changed, 15 insertions, 15 deletions

diff --git a/config.tests/alsa/alsatest.cpp b/config.tests/alsa/alsatest.cpp
index 690f30d57..b74298d03 100644
--- a/config.tests/alsa/alsatest.cpp
+++ b/config.tests/alsa/alsatest.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 documentation of the Qt Toolkit.
diff --git a/config.tests/avfoundation/main.mm b/config.tests/avfoundation/main.mm
index 1f10ec3a6..aa819cd17 100644
--- a/config.tests/avfoundation/main.mm
+++ b/config.tests/avfoundation/main.mm
@@ -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/config.tests/directshow/main.cpp b/config.tests/directshow/main.cpp
index fd888c1f4..6611741db 100644
--- a/config.tests/directshow/main.cpp
+++ b/config.tests/directshow/main.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 Mobility Components.
diff --git a/config.tests/evr/main.cpp b/config.tests/evr/main.cpp
index 1bd75afe7..11d05b665 100644
--- a/config.tests/evr/main.cpp
+++ b/config.tests/evr/main.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 Mobility Components.
diff --git a/config.tests/gstreamer/main.cpp b/config.tests/gstreamer/main.cpp
index 0631f088d..e7e33b24c 100644
--- a/config.tests/gstreamer/main.cpp
+++ b/config.tests/gstreamer/main.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/config.tests/gstreamer_appsrc/main.cpp b/config.tests/gstreamer_appsrc/main.cpp
index 3d55ff60a..ba5094a87 100644
--- a/config.tests/gstreamer_appsrc/main.cpp
+++ b/config.tests/gstreamer_appsrc/main.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 Mobility Components.
diff --git a/config.tests/gstreamer_encodingprofiles/main.cpp b/config.tests/gstreamer_encodingprofiles/main.cpp
index 0a4502342..7f69f4e68 100644
--- a/config.tests/gstreamer_encodingprofiles/main.cpp
+++ b/config.tests/gstreamer_encodingprofiles/main.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/config.tests/gstreamer_photography/main.cpp b/config.tests/gstreamer_photography/main.cpp
index 2966a8337..c13852d05 100644
--- a/config.tests/gstreamer_photography/main.cpp
+++ b/config.tests/gstreamer_photography/main.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/config.tests/openal/main.cpp b/config.tests/openal/main.cpp
index 87189ada2..3395690f2 100644
--- a/config.tests/openal/main.cpp
+++ b/config.tests/openal/main.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 plugins of the Qt Toolkit.
diff --git a/config.tests/pulseaudio/pulseaudio.cpp b/config.tests/pulseaudio/pulseaudio.cpp
index 3d6a089c5..c8be2740b 100644
--- a/config.tests/pulseaudio/pulseaudio.cpp
+++ b/config.tests/pulseaudio/pulseaudio.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 Mobility Components.
diff --git a/config.tests/resourcepolicy/main.cpp b/config.tests/resourcepolicy/main.cpp
index 44c03da22..a2097fd92 100644
--- a/config.tests/resourcepolicy/main.cpp
+++ b/config.tests/resourcepolicy/main.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 Mobility Components.
diff --git a/config.tests/wmf/main.cpp b/config.tests/wmf/main.cpp
index 10e748e70..bdd69adec 100644
--- a/config.tests/wmf/main.cpp
+++ b/config.tests/wmf/main.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 Mobility Components.
diff --git a/config.tests/wmp/main.cpp b/config.tests/wmp/main.cpp
index 40395b737..1667ebc8a 100644
--- a/config.tests/wmp/main.cpp
+++ b/config.tests/wmp/main.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 Mobility Components.
diff --git a/config.tests/wmsdk/main.cpp b/config.tests/wmsdk/main.cpp
index c67d8dd2d..cfe927cd8 100644
--- a/config.tests/wmsdk/main.cpp
+++ b/config.tests/wmsdk/main.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 Mobility Components.
diff --git a/config.tests/xvideo/main.cpp b/config.tests/xvideo/main.cpp
index 3d37a4d00..fb7b48768 100644
--- a/config.tests/xvideo/main.cpp
+++ b/config.tests/xvideo/main.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 Multimedia module of the Qt Toolkit.