diff options
| author | Janne Koskinen <janne.p.koskinen@digia.com> | 2009-12-22 09:04:22 (GMT) |
|---|---|---|
| committer | Janne Koskinen <janne.p.koskinen@digia.com> | 2009-12-22 09:04:22 (GMT) |
| commit | ec19758c28efc6e1c712d44a6cb32ace38d3178d (patch) | |
| tree | b50b2058b7f3a566e31dbc6b86dc947273720bdd /tests/auto/headers/tst_headers.cpp | |
| parent | 2a20705f874ddad55282f22fabfe30927729ae50 (diff) | |
| parent | f61a32948da3cac4b83123267ae8c5d2fa0525f6 (diff) | |
| download | Qt-ec19758c28efc6e1c712d44a6cb32ace38d3178d.zip Qt-ec19758c28efc6e1c712d44a6cb32ace38d3178d.tar.gz Qt-ec19758c28efc6e1c712d44a6cb32ace38d3178d.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6
Diffstat (limited to 'tests/auto/headers/tst_headers.cpp')
| -rw-r--r-- | tests/auto/headers/tst_headers.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/headers/tst_headers.cpp b/tests/auto/headers/tst_headers.cpp index 36d25fe..329143d 100644 --- a/tests/auto/headers/tst_headers.cpp +++ b/tests/auto/headers/tst_headers.cpp @@ -217,8 +217,8 @@ void tst_Headers::licenseCheck() QCOMPARE(content.at(i++), QString("/****************************************************************************")); if (licenseType != "3RDPARTY") { QCOMPARE(content.at(i++), QString("**")); - if (sourceFile.endsWith("/tests/auto/qabstractitemmodel/dynamictreemodel.cpp") - || sourceFile.endsWith("/tests/auto/qabstractitemmodel/dynamictreemodel.h") + if (sourceFile.endsWith("/tests/auto/modeltest/dynamictreemodel.cpp") + || sourceFile.endsWith("/tests/auto/modeltest/dynamictreemodel.h") || sourceFile.endsWith("/src/network/kernel/qnetworkproxy_p.h")) { // These files are not copyrighted by Nokia. |