tst_licenses.pl: do not require an "All rights reserved" line

This is not part of the recommended license template.
It remains permitted for the time being, but may be deprecated and
banned later.

Task-number: QTQAINFRA-404
Change-Id: I072bd530ca4f48d34deb3d59e266a5e85c435bc5
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>

2 files changed, 43 insertions, 1 deletions

diff --git a/scripts/t/license-testdata/expected-output.txt b/scripts/t/license-testdata/expected-output.txt
index cf1897ed..664bcb18 100644
--- a/scripts/t/license-testdata/expected-output.txt
+++ b/scripts/t/license-testdata/expected-output.txt
@@ -43,13 +43,14 @@
 # The test numbers are also ignored (as long as the total count of tests
 # is as expected).
 
-1..10
+1..11
 not ok x - QT_BEGIN_LICENSE does not follow Copyright block in bad/missing-license-info.qdoc, line 9
 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 - Mismatch in license text in bad/wrong-lgpl-nokia.sh
 ok x - good/multiple-copyright-lgpl.g
 ok x - good/multiple-headers.cpp
+ok x - good/not-all-rights-reserved-nokia.cpp
 ok x - good/typical-bsd-nokia.cpp
 ok x - good/typical-fdl-nokia.qdoc
 ok x - good/typical-lgpl-nokia.cpp
diff --git a/scripts/t/license-testdata/good/not-all-rights-reserved-nokia.cpp b/scripts/t/license-testdata/good/not-all-rights-reserved-nokia.cpp
new file mode 100644
index 00000000..413097f2
--- /dev/null
+++ b/scripts/t/license-testdata/good/not-all-rights-reserved-nokia.cpp
@@ -0,0 +1,41 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the (whatever) of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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 packaging of this
+** file. Please review the following information to 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.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+// code goes here ...