diff options
author | Teemu Kaukoranta <teemu.kaukoranta@digia.com> | 2013-05-28 14:06:14 +0300 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-11 06:08:21 +0200 |
commit | c504d5b8047483e87fd1cfad2c2824353310c5da (patch) | |
tree | a189602d4677210a05b0fe24c72c4c5c94cbe1b7 /doc | |
parent | 5a466fc74a67e6c28722c9e0d26fcf876c7a0e9b (diff) |
Fixed copyright and contact headers
Removed deprecated "all rights reserved" strings
Changed contact details to qt-project.org/legal
Used the following command:
find . -path '*/3rdparty/*' -prune -o -exec grep -ilI -E
'.*Copyright.*Nokia.*|.*Contact.*' {} \; | tee
>(xargs sed -i -r '1,50 { /INdT|copy[a-z]*[ ]*=/ !{
s/(^[ \t:#*;/"\\-]*)([a-z ]*)(Copyright.*Nokia.*)/
\1\2Copyright \(C\) 2013 Digia Plc and\/or its subsidiary\(-ies\)\./I
}}') >(xargs sed -i -r '1,50 s/(^[ \t:#*;/"\\-]*)
(.*info@qt\.nokia\.com.*|.*INSERT EMAIL ADDRESS.*
|.*qt-info@nokia\.com.*|.*qt-label1@nokia\.com.*
|.*http:\/\/qt\.nokia\.com\/contact.*|.*qt-sales@nokia\.com.*
|.*http:\/\/www\.qt-project\.org\/.*)/
\1Contact: http:\/\/www\.qt-project\.org\/legal/I') >(xargs
sed -i -r '1,50{/(^[ \t:#*;/"\\-]*)(all rights reserved.*)/Id}')
Change-Id: Ic57037fd897a54440e4bad0939ee2bf9f1dfcd5d
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Diffstat (limited to 'doc')
-rw-r--r-- | doc/src/classes/phonon-api.qdoc | 2 | ||||
-rw-r--r-- | doc/src/snippets/qlistview-dnd/model.cpp | 1 | ||||
-rw-r--r-- | doc/src/snippets/qlistview-dnd/model.h | 1 | ||||
-rw-r--r-- | doc/src/snippets/qlistview-using/model.h | 1 | ||||
-rw-r--r-- | doc/src/snippets/qtreeview-dnd/dragdropmodel.cpp | 1 |
5 files changed, 1 insertions, 5 deletions
diff --git a/doc/src/classes/phonon-api.qdoc b/doc/src/classes/phonon-api.qdoc index 38e12fe8fc..a45f16989e 100644 --- a/doc/src/classes/phonon-api.qdoc +++ b/doc/src/classes/phonon-api.qdoc @@ -2,7 +2,7 @@ This file is part of the KDE project Copyright (C) 2005-2007 Matthias Kretz <kretz@kde.org> Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). - Contact: Nokia Corporation (qt-info@nokia.com) + Contact: http://www.qt-project.org/legal This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public diff --git a/doc/src/snippets/qlistview-dnd/model.cpp b/doc/src/snippets/qlistview-dnd/model.cpp index 31600fb394..6ebeb2eb56 100644 --- a/doc/src/snippets/qlistview-dnd/model.cpp +++ b/doc/src/snippets/qlistview-dnd/model.cpp @@ -41,7 +41,6 @@ /**************************************************************************** ** ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** All rights reserved. ** Contact: http://www.qt-project.org/legal ** ** This file is part of an example program for Qt. diff --git a/doc/src/snippets/qlistview-dnd/model.h b/doc/src/snippets/qlistview-dnd/model.h index 56f9a5ff6f..9b667ad4a3 100644 --- a/doc/src/snippets/qlistview-dnd/model.h +++ b/doc/src/snippets/qlistview-dnd/model.h @@ -41,7 +41,6 @@ /**************************************************************************** ** ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** All rights reserved. ** Contact: http://www.qt-project.org/legal ** ** This file is part of an example program for Qt. diff --git a/doc/src/snippets/qlistview-using/model.h b/doc/src/snippets/qlistview-using/model.h index 79615cfb3a..5938f98718 100644 --- a/doc/src/snippets/qlistview-using/model.h +++ b/doc/src/snippets/qlistview-using/model.h @@ -41,7 +41,6 @@ /**************************************************************************** ** ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** All rights reserved. ** Contact: http://www.qt-project.org/legal ** ** This file is part of an example program for Qt. diff --git a/doc/src/snippets/qtreeview-dnd/dragdropmodel.cpp b/doc/src/snippets/qtreeview-dnd/dragdropmodel.cpp index 27a5c94282..49dca193a0 100644 --- a/doc/src/snippets/qtreeview-dnd/dragdropmodel.cpp +++ b/doc/src/snippets/qtreeview-dnd/dragdropmodel.cpp @@ -41,7 +41,6 @@ /**************************************************************************** ** ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** All rights reserved. ** Contact: http://www.qt-project.org/legal ** ** This file is part of an example program for Qt. |