Disallow use of the old Nokia contact email in license headers.

This commit modifies the license checker autotest to reject files
containing the obsolete Nokia contact email address.  The URL
http://www.qt-project.org/ should now be used as the contact address in
all license headers.  The license checker's selftest is also modified
accordingly.

Change-Id: Ic18aecbf1c4d2c93968257fbfbed58399f0739fa
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>

12 files changed, 18 insertions, 17 deletions

diff --git a/scripts/t/license-testdata/bad/missing-license-info.qdoc b/scripts/t/license-testdata/bad/missing-license-info.qdoc
index 50eaba0d..80ab2a70 100644
--- a/scripts/t/license-testdata/bad/missing-license-info.qdoc
+++ b/scripts/t/license-testdata/bad/missing-license-info.qdoc
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: http://www.qt-project.org/
 **
 ** This file is part of the (whatever) of the Qt Toolkit.
 **
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 99b91a21..7bdfbb30 100644
--- a/scripts/t/license-testdata/bad/multiple-header-one-wrong.s
+++ b/scripts/t/license-testdata/bad/multiple-header-one-wrong.s
@@ -2,7 +2,7 @@
 ;**
 ;** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ;** All rights reserved.
-;** Contact: Nokia Corporation (qt-info@nokia.com)
+;** Contact: http://www.qt-project.org/
 ;**
 ;** This file is part of the (whatever) of the Qt Toolkit.
 ;**
@@ -46,7 +46,7 @@
 ;**
 ;** Copyright (C) 2012 Fake Corporation and/or its subsidiary(-ies).
 ;** All rights reserved.
-;** Contact: Nokia Corporation (qt-info@nokia.com)
+;** Contact: http://www.qt-project.org/
 ;**
 ;** This file is part of the (whatever) of the Qt Toolkit.
 ;**
@@ -92,7 +92,7 @@
 ;**
 ;** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ;** All rights reserved.
-;** Contact: Nokia Corporation (qt-info@nokia.com)
+;** Contact: http://www.qt-project.org/
 ;**
 ;** This file is part of the (whatever) of the Qt Toolkit.
 ;**
diff --git a/scripts/t/license-testdata/good/typical-lgpl-qt-project.cpp b/scripts/t/license-testdata/bad/old-contact-info.cpp
index 4f2de366..221a98a4 100644
--- a/scripts/t/license-testdata/good/typical-lgpl-qt-project.cpp
+++ b/scripts/t/license-testdata/bad/old-contact-info.cpp
@@ -1,9 +1,10 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Company name/Contributor's name <email@example.com>
-** Contact: http://www.qt-project.org/
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the FOO module of the Qt Toolkit.
+** This file is part of the (whatever) of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
diff --git a/scripts/t/license-testdata/bad/wrong-lgpl-nokia.sh b/scripts/t/license-testdata/bad/wrong-lgpl-nokia.sh
index 786cce7d..b128e91a 100644
--- a/scripts/t/license-testdata/bad/wrong-lgpl-nokia.sh
+++ b/scripts/t/license-testdata/bad/wrong-lgpl-nokia.sh
@@ -2,7 +2,7 @@
 ##
 ## Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ## All rights reserved.
-## Contact: Nokia Corporation (qt-info@nokia.com)
+## Contact: http://www.qt-project.org/
 ##
 ## This file is part of the (whatever) of the Qt Toolkit.
 ##
diff --git a/scripts/t/license-testdata/expected-output.txt b/scripts/t/license-testdata/expected-output.txt
index 1a51dd67..a3481fbd 100644
--- a/scripts/t/license-testdata/expected-output.txt
+++ b/scripts/t/license-testdata/expected-output.txt
@@ -48,6 +48,7 @@
 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 - bad/old-contact-info.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
@@ -56,4 +57,3 @@ ok x - good/typical-bsd-nokia.cpp
 ok x - good/typical-fdl-nokia.qdoc
 ok x - good/typical-lgpl-nokia.cpp
 ok x - good/typical-lgpl-only-nokia.bat
-ok x - good/typical-lgpl-qt-project.cpp
diff --git a/scripts/t/license-testdata/good/multiple-copyright-lgpl.g b/scripts/t/license-testdata/good/multiple-copyright-lgpl.g
index 39d10759..05a6d61d 100644
--- a/scripts/t/license-testdata/good/multiple-copyright-lgpl.g
+++ b/scripts/t/license-testdata/good/multiple-copyright-lgpl.g
@@ -3,7 +3,7 @@
 -- Copyright (C) 2012 Alice
 -- Copyright (C) 2012 Bob
 -- All rights reserved.
--- Contact: Nokia Corporation (qt-info@nokia.com)
+-- Contact: http://www.qt-project.org/
 --
 -- 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 eceeaf41..352a9d17 100644
--- a/scripts/t/license-testdata/good/multiple-headers.cpp
+++ b/scripts/t/license-testdata/good/multiple-headers.cpp
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: http://www.qt-project.org/
 **
 ** This file is part of the (whatever) of the Qt Toolkit.
 **
@@ -48,7 +48,7 @@
 - Copyright (C) 2012 Example Corporation and/or its subsidiary(-ies).
 -
 - All rights reserved.
-- Contact: Nokia Corporation (qt-info@nokia.com)
+- Contact: http://www.qt-project.org/
 -
 - This file is part of the (crazy generated code) of the Qt Toolkit.
 -
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
index 487a2496..2f071fdd 100644
--- a/scripts/t/license-testdata/good/not-all-rights-reserved-nokia.cpp
+++ b/scripts/t/license-testdata/good/not-all-rights-reserved-nokia.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: http://www.qt-project.org/
 **
 ** This file is part of the (whatever) 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 3be5f822..2fbc7592 100644
--- a/scripts/t/license-testdata/good/typical-bsd-nokia.cpp
+++ b/scripts/t/license-testdata/good/typical-bsd-nokia.cpp
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: http://www.qt-project.org/
 **
 ** 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 9d832aa7..2471e695 100644
--- a/scripts/t/license-testdata/good/typical-fdl-nokia.qdoc
+++ b/scripts/t/license-testdata/good/typical-fdl-nokia.qdoc
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: http://www.qt-project.org/
 **
 ** 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 221a98a4..fe004f97 100644
--- a/scripts/t/license-testdata/good/typical-lgpl-nokia.cpp
+++ b/scripts/t/license-testdata/good/typical-lgpl-nokia.cpp
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: http://www.qt-project.org/
 **
 ** 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 5f68f610..e6acb66a 100644
--- a/scripts/t/license-testdata/good/typical-lgpl-only-nokia.bat
+++ b/scripts/t/license-testdata/good/typical-lgpl-only-nokia.bat
@@ -2,7 +2,7 @@
 ::
 :: Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 :: All rights reserved.
-:: Contact: Nokia Corporation (qt-info@nokia.com)
+:: Contact: http://www.qt-project.org/
 ::
 :: This file is part of the (whatever) of the Qt Toolkit.
 ::