From c642dfce4066b6af80e344a60917598ad053a411 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Wed, 1 Aug 2012 20:50:21 +0200 Subject: Stop allowing the old-style Contact: line in license headers The following line should be used instead ## Contact: http://www.qt-project.org/ Change-Id: I75479b017a76872640043920811066d4a0605a10 Reviewed-by: Rohan McGovern Reviewed-by: Toby Tomkins Reviewed-by: Jason McDonald --- tests/auto/headers/tst_headers.cpp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/tests/auto/headers/tst_headers.cpp b/tests/auto/headers/tst_headers.cpp index bb79906..6f4a9ad 100644 --- a/tests/auto/headers/tst_headers.cpp +++ b/tests/auto/headers/tst_headers.cpp @@ -275,13 +275,7 @@ void tst_Headers::licenseCheck() } else { QVERIFY(copyrightPattern.exactMatch(content.at(i++))); } - // The old-style Contact: line should be replaced with - // Contact: http://www.qt-project.org/ - // but it's still allowed. - if (content.at(i++) != QString("** Contact: http://www.qt-project.org/")) { - // here this i++ assumes that 'All rights reserved' line still exists - QCOMPARE(content.at(i++), QString("** Contact: Nokia Corporation (qt-info@nokia.com)")); - } + QCOMPARE(content.at(i++), QString("** Contact: http://www.qt-project.org/")); } QCOMPARE(content.at(i++), QString("**")); QVERIFY(moduleTest.exactMatch(content.at(i++))); -- cgit v0.12