summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorSergio Ahumada <sergio.ahumada@nokia.com>2012-08-01 18:50:21 (GMT)
committerQt by Nokia <qt-info@nokia.com>2012-08-02 13:14:20 (GMT)
commitc642dfce4066b6af80e344a60917598ad053a411 (patch)
tree748fd078abb79065279e03c6c8db17bd554dd1f1 /tests
parent024fed3d496d35e0d3aa6a6aa205fcda4d8217f8 (diff)
downloadQt-c642dfce4066b6af80e344a60917598ad053a411.zip
Qt-c642dfce4066b6af80e344a60917598ad053a411.tar.gz
Qt-c642dfce4066b6af80e344a60917598ad053a411.tar.bz2
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 <rohan.mcgovern@nokia.com> Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/headers/tst_headers.cpp8
1 files changed, 1 insertions, 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++)));