summaryrefslogtreecommitdiffstats
path: root/plugins/declarative/multimedia
diff options
context:
space:
mode:
authorSergio Ahumada <sergio.ahumada@digia.com>2012-11-06 19:41:46 +0100
committerSergio Ahumada <sergio.ahumada@digia.com>2012-11-07 11:17:54 +0100
commit8de152a9e1deb533070663cccf6a98e0d374b1d6 (patch)
tree88895d60baa036339e9b43607d1705c57d1b281a /plugins/declarative/multimedia
parent5d05d0cf36641c8754ca49aeb18cfda9971e0119 (diff)
Change copyrights from Nokia to Digia
Change copyrights and license headers from Nokia to Digia Change-Id: Ie3b9224b2b6a32b417fa0b6643350d45046381e6 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'plugins/declarative/multimedia')
-rw-r--r--plugins/declarative/multimedia/multimedia.cpp6
-rw-r--r--plugins/declarative/multimedia/qdeclarativeaudio.cpp6
-rw-r--r--plugins/declarative/multimedia/qdeclarativeaudio_p.h6
-rw-r--r--plugins/declarative/multimedia/qdeclarativecamera.cpp6
-rw-r--r--plugins/declarative/multimedia/qdeclarativecamera_p.h6
-rw-r--r--plugins/declarative/multimedia/qdeclarativecamerapreviewprovider.cpp6
-rw-r--r--plugins/declarative/multimedia/qdeclarativecamerapreviewprovider_p.h6
-rw-r--r--plugins/declarative/multimedia/qdeclarativemediabase.cpp6
-rw-r--r--plugins/declarative/multimedia/qdeclarativemediabase_p.h6
-rw-r--r--plugins/declarative/multimedia/qdeclarativemediametadata_p.h6
-rw-r--r--plugins/declarative/multimedia/qdeclarativevideo.cpp6
-rw-r--r--plugins/declarative/multimedia/qdeclarativevideo_p.h6
12 files changed, 36 insertions, 36 deletions
diff --git a/plugins/declarative/multimedia/multimedia.cpp b/plugins/declarative/multimedia/multimedia.cpp
index ece00a692b..b24ceea111 100644
--- a/plugins/declarative/multimedia/multimedia.cpp
+++ b/plugins/declarative/multimedia/multimedia.cpp
@@ -1,8 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Mobility Components.
**
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/plugins/declarative/multimedia/qdeclarativeaudio.cpp b/plugins/declarative/multimedia/qdeclarativeaudio.cpp
index fce92b0a9f..e7fc570521 100644
--- a/plugins/declarative/multimedia/qdeclarativeaudio.cpp
+++ b/plugins/declarative/multimedia/qdeclarativeaudio.cpp
@@ -1,8 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Mobility Components.
**
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/plugins/declarative/multimedia/qdeclarativeaudio_p.h b/plugins/declarative/multimedia/qdeclarativeaudio_p.h
index bc7139a822..c28e7a6e64 100644
--- a/plugins/declarative/multimedia/qdeclarativeaudio_p.h
+++ b/plugins/declarative/multimedia/qdeclarativeaudio_p.h
@@ -1,8 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Mobility Components.
**
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/plugins/declarative/multimedia/qdeclarativecamera.cpp b/plugins/declarative/multimedia/qdeclarativecamera.cpp
index 76e71da7a9..7ec3c54c11 100644
--- a/plugins/declarative/multimedia/qdeclarativecamera.cpp
+++ b/plugins/declarative/multimedia/qdeclarativecamera.cpp
@@ -1,8 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Copyright (C) 2012 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.
**
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/plugins/declarative/multimedia/qdeclarativecamera_p.h b/plugins/declarative/multimedia/qdeclarativecamera_p.h
index 3dfcf157f6..cdb3479ca9 100644
--- a/plugins/declarative/multimedia/qdeclarativecamera_p.h
+++ b/plugins/declarative/multimedia/qdeclarativecamera_p.h
@@ -1,8 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Copyright (C) 2012 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.
**
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/plugins/declarative/multimedia/qdeclarativecamerapreviewprovider.cpp b/plugins/declarative/multimedia/qdeclarativecamerapreviewprovider.cpp
index 16d528b636..6ad186c8ca 100644
--- a/plugins/declarative/multimedia/qdeclarativecamerapreviewprovider.cpp
+++ b/plugins/declarative/multimedia/qdeclarativecamerapreviewprovider.cpp
@@ -1,8 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Copyright (C) 2012 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.
**
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/plugins/declarative/multimedia/qdeclarativecamerapreviewprovider_p.h b/plugins/declarative/multimedia/qdeclarativecamerapreviewprovider_p.h
index 8f5ecc08d3..6f2b20a577 100644
--- a/plugins/declarative/multimedia/qdeclarativecamerapreviewprovider_p.h
+++ b/plugins/declarative/multimedia/qdeclarativecamerapreviewprovider_p.h
@@ -1,8 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Copyright (C) 2012 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.
**
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/plugins/declarative/multimedia/qdeclarativemediabase.cpp b/plugins/declarative/multimedia/qdeclarativemediabase.cpp
index df962b9303..4d0f90d6ae 100644
--- a/plugins/declarative/multimedia/qdeclarativemediabase.cpp
+++ b/plugins/declarative/multimedia/qdeclarativemediabase.cpp
@@ -1,8 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Mobility Components.
**
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/plugins/declarative/multimedia/qdeclarativemediabase_p.h b/plugins/declarative/multimedia/qdeclarativemediabase_p.h
index a9b115547c..b65d750441 100644
--- a/plugins/declarative/multimedia/qdeclarativemediabase_p.h
+++ b/plugins/declarative/multimedia/qdeclarativemediabase_p.h
@@ -1,8 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Mobility Components.
**
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/plugins/declarative/multimedia/qdeclarativemediametadata_p.h b/plugins/declarative/multimedia/qdeclarativemediametadata_p.h
index 6148d58e81..bcb83139c7 100644
--- a/plugins/declarative/multimedia/qdeclarativemediametadata_p.h
+++ b/plugins/declarative/multimedia/qdeclarativemediametadata_p.h
@@ -1,8 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Mobility Components.
**
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/plugins/declarative/multimedia/qdeclarativevideo.cpp b/plugins/declarative/multimedia/qdeclarativevideo.cpp
index 8f8b30cc0a..f61b03dec3 100644
--- a/plugins/declarative/multimedia/qdeclarativevideo.cpp
+++ b/plugins/declarative/multimedia/qdeclarativevideo.cpp
@@ -1,8 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Mobility Components.
**
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/plugins/declarative/multimedia/qdeclarativevideo_p.h b/plugins/declarative/multimedia/qdeclarativevideo_p.h
index a11e9cd2d9..be9460add2 100644
--- a/plugins/declarative/multimedia/qdeclarativevideo_p.h
+++ b/plugins/declarative/multimedia/qdeclarativevideo_p.h
@@ -1,8 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt Mobility Components.
**
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/