qt-gstreamer: Fixed license headers

George Kiagiadakis gkiagia at kemper.freedesktop.org
Tue Feb 7 09:13:23 PST 2012


Module: qt-gstreamer
Branch: master
Commit: dc0af9d687157ad69e827d248a4fc97f755ab1ea
URL:    http://cgit.freedesktop.org/gstreamer/qt-gstreamer/commit/?id=dc0af9d687157ad69e827d248a4fc97f755ab1ea

Author: Mateu Batle <mateu.batle at collabora.co.uk>
Date:   Sun Feb 13 17:50:34 2011 -0500

Fixed license headers

---

 qpaintervideosurface.cpp |   26 ++------------------------
 qpaintervideosurface.h   |   26 ++------------------------
 qvideosurfacegstsink.cpp |   26 ++------------------------
 qvideosurfacegstsink.h   |   26 ++------------------------
 4 files changed, 8 insertions(+), 96 deletions(-)

diff --git a/qpaintervideosurface.cpp b/qpaintervideosurface.cpp
index b36b9ac..c9cf0b7 100644
--- a/qpaintervideosurface.cpp
+++ b/qpaintervideosurface.cpp
@@ -1,17 +1,11 @@
 /****************************************************************************
 **
+** Copyright (C) 2011 Collabora Ltd
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info at nokia.com)
 **
-** This file is part of the Qt Mobility Components.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** This file was originally part of the Qt Mobility Components.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -21,22 +15,6 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info at nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
 ****************************************************************************/
 
 #include "qpaintervideosurface.h"
diff --git a/qpaintervideosurface.h b/qpaintervideosurface.h
index d5c7c24..68e1685 100644
--- a/qpaintervideosurface.h
+++ b/qpaintervideosurface.h
@@ -1,17 +1,11 @@
 /****************************************************************************
 **
+** Copyright (C) 2011 Collabora Ltd
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info at nokia.com)
 **
-** This file is part of the Qt Mobility Components.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** This file was originally part of the Qt Mobility Components.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -21,22 +15,6 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info at nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
 ****************************************************************************/
 
 #ifndef QPAINTERVIDEOSURFACE_P_H
diff --git a/qvideosurfacegstsink.cpp b/qvideosurfacegstsink.cpp
index cb2b93b..e36f594 100644
--- a/qvideosurfacegstsink.cpp
+++ b/qvideosurfacegstsink.cpp
@@ -1,17 +1,11 @@
 /****************************************************************************
 **
+** Copyright (C) 2011 Collabora Ltd
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info at nokia.com)
 **
-** This file is part of the Qt Mobility Components.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** This file was originally part of the Qt Mobility Components.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -21,22 +15,6 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info at nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
 ****************************************************************************/
 
 #include <qabstractvideosurface.h>
diff --git a/qvideosurfacegstsink.h b/qvideosurfacegstsink.h
index 6dafa66..ea2c820 100644
--- a/qvideosurfacegstsink.h
+++ b/qvideosurfacegstsink.h
@@ -1,17 +1,11 @@
 /****************************************************************************
 **
+** Copyright (C) 2011 Collabora Ltd
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info at nokia.com)
 **
-** This file is part of the Qt Mobility Components.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
+** This file was originally part of the Qt Mobility Components.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -21,22 +15,6 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info at nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
 ****************************************************************************/
 
 #ifndef VIDEOSURFACEGSTSINK_H



More information about the gstreamer-commits mailing list