tst_licenses.pl: Don't make "All rights reserved" line optional

We should really avoid this in all the modules from now on.

Change-Id: Ibcfb29406564613bbd03db10c698fcd6acf7fa3e
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>

10 files changed, 4 insertions, 17 deletions

diff --git a/scripts/t/license-testdata/bad/multiple-header-one-wrong.s b/scripts/t/license-testdata/bad/multiple-header-one-wrong.s
index 5f0b2c27..d8f94b37 100644
--- a/scripts/t/license-testdata/bad/multiple-header-one-wrong.s
+++ b/scripts/t/license-testdata/bad/multiple-header-one-wrong.s
@@ -1,7 +1,6 @@
 ;/****************************************************************************
 ;**
 ;** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-;** All rights reserved.
 ;** Contact: http://www.qt-project.org/legal
 ;**
 ;** This file is part of the (whatever) of the Qt Toolkit.
@@ -45,7 +44,6 @@
 ;/****************************************************************************
 ;**
 ;** Copyright (C) 2012 Fake Corporation and/or its subsidiary(-ies).
-;** All rights reserved.
 ;** Contact: http://www.qt-project.org/legal
 ;**
 ;** This file is part of the (whatever) of the Qt Toolkit.
@@ -59,7 +57,7 @@
 ;** conditions see http://qt.digia.com/licensing.  For further information
 ;** use the contact form at http://qt.digia.com/contact-us.
 ;**
-;** GNU Lesser General Public License Usage
+;** GNU Llama Goat Porpoise Lemon Usage
 ;** Alternatively, this file may be used under the terms of the GNU Lesser
 ;** General Public License version 2.1 as published by the Free Software
 ;** Foundation and appearing in the file LICENSE.LGPL included in the
@@ -91,7 +89,6 @@
 ;/****************************************************************************
 ;**
 ;** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-;** All rights reserved.
 ;** Contact: http://www.qt-project.org/legal
 ;**
 ;** This file is part of the (whatever) of the Qt Toolkit.
diff --git a/scripts/t/license-testdata/bad/old-contact-info.cpp b/scripts/t/license-testdata/bad/old-contact-info.cpp
index b72a4462..9c0f914d 100644
--- a/scripts/t/license-testdata/bad/old-contact-info.cpp
+++ b/scripts/t/license-testdata/bad/old-contact-info.cpp
@@ -1,8 +1,7 @@
 /****************************************************************************
 **
 ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: http://www.qt-project.org/legal
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the (whatever) of the Qt Toolkit.
 **
diff --git a/scripts/t/license-testdata/bad/wrong-lgpl-nokia.sh b/scripts/t/license-testdata/bad/wrong-lgpl-nokia.sh
index 6fdfad55..5f02d494 100644
--- a/scripts/t/license-testdata/bad/wrong-lgpl-nokia.sh
+++ b/scripts/t/license-testdata/bad/wrong-lgpl-nokia.sh
@@ -1,7 +1,6 @@
 ############################################################################
 ##
 ## Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-## All rights reserved.
 ## Contact: http://www.qt-project.org/legal
 ##
 ## This file is part of the (whatever) of the Qt Toolkit.
@@ -35,7 +34,7 @@
 ## ensure the GNU General Public License version 3.0 requirements will be
 ## met: http://www.gnu.org/copyleft/gpl.html.
 ##
-##
+## Other usage
 ## $QT_END_LICENSE$
 ##
 ############################################################################
diff --git a/scripts/t/license-testdata/expected-output.txt b/scripts/t/license-testdata/expected-output.txt
index b6d981c0..1c801c79 100644
--- a/scripts/t/license-testdata/expected-output.txt
+++ b/scripts/t/license-testdata/expected-output.txt
@@ -1,6 +1,5 @@
 #
 # Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-# All rights reserved.
 # Contact: http://www.qt-project.org/legal
 #
 # This file is part of the automated tests of the Qt Toolkit.
@@ -45,7 +44,7 @@
 # is as expected).
 
 1..12
-not ok x - QT_BEGIN_LICENSE does not follow Copyright block in bad/missing-license-info.qdoc, line 9
+not ok x - QT_BEGIN_LICENSE does not follow Copyright block in bad/missing-license-info.qdoc, line 8
 not ok x - Mismatch in license text in bad/multiple-header-one-wrong.s
 not ok x - bad/noheader.cpp does not appear to contain a license header
 not ok x - bad/old-contact-info.cpp does not appear to contain a license header
diff --git a/scripts/t/license-testdata/good/multiple-copyright-lgpl.g b/scripts/t/license-testdata/good/multiple-copyright-lgpl.g
index 67571693..de0d2f2b 100644
--- a/scripts/t/license-testdata/good/multiple-copyright-lgpl.g
+++ b/scripts/t/license-testdata/good/multiple-copyright-lgpl.g
@@ -2,7 +2,6 @@
 --
 -- Copyright (C) 2012 Alice
 -- Copyright (C) 2012 Bob
--- All rights reserved.
 -- Contact: http://www.qt-project.org/legal
 --
 -- This file is part of the (whatever) of the Qt Toolkit.
diff --git a/scripts/t/license-testdata/good/multiple-headers.cpp b/scripts/t/license-testdata/good/multiple-headers.cpp
index 1ef177a9..866f50c2 100644
--- a/scripts/t/license-testdata/good/multiple-headers.cpp
+++ b/scripts/t/license-testdata/good/multiple-headers.cpp
@@ -1,7 +1,6 @@
 /****************************************************************************
 **
 ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** All rights reserved.
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the (whatever) of the Qt Toolkit.
@@ -47,7 +46,6 @@
 
 - Copyright (C) 2012 Example Corporation and/or its subsidiary(-ies).
 -
-- All rights reserved.
 - Contact: http://www.qt-project.org/legal
 -
 - This file is part of the (crazy generated code) of the Qt Toolkit.
diff --git a/scripts/t/license-testdata/good/typical-bsd-nokia.cpp b/scripts/t/license-testdata/good/typical-bsd-nokia.cpp
index c3d47702..f69cd295 100644
--- a/scripts/t/license-testdata/good/typical-bsd-nokia.cpp
+++ b/scripts/t/license-testdata/good/typical-bsd-nokia.cpp
@@ -1,7 +1,6 @@
 /****************************************************************************
 **
 ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** All rights reserved.
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the (whatever) of the Qt Toolkit.
diff --git a/scripts/t/license-testdata/good/typical-fdl-nokia.qdoc b/scripts/t/license-testdata/good/typical-fdl-nokia.qdoc
index b18ef7be..984495f6 100644
--- a/scripts/t/license-testdata/good/typical-fdl-nokia.qdoc
+++ b/scripts/t/license-testdata/good/typical-fdl-nokia.qdoc
@@ -1,7 +1,6 @@
 /****************************************************************************
 **
 ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** All rights reserved.
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the (whatever) of the Qt Toolkit.
diff --git a/scripts/t/license-testdata/good/typical-lgpl-nokia.cpp b/scripts/t/license-testdata/good/typical-lgpl-nokia.cpp
index b72a4462..1c3ede48 100644
--- a/scripts/t/license-testdata/good/typical-lgpl-nokia.cpp
+++ b/scripts/t/license-testdata/good/typical-lgpl-nokia.cpp
@@ -1,7 +1,6 @@
 /****************************************************************************
 **
 ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** All rights reserved.
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the (whatever) of the Qt Toolkit.
diff --git a/scripts/t/license-testdata/good/typical-lgpl-only-nokia.bat b/scripts/t/license-testdata/good/typical-lgpl-only-nokia.bat
index c386e1aa..72f1a0e4 100644
--- a/scripts/t/license-testdata/good/typical-lgpl-only-nokia.bat
+++ b/scripts/t/license-testdata/good/typical-lgpl-only-nokia.bat
@@ -1,7 +1,6 @@
 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 ::
 :: Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-:: All rights reserved.
 :: Contact: http://www.qt-project.org/legal
 ::
 :: This file is part of the (whatever) of the Qt Toolkit.