diff options
| author | Sergio Ahumada <sergio.ahumada@nokia.com> | 2012-08-12 09:25:26 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-14 21:05:16 (GMT) |
| commit | 374c5f5c5ac72f1d564cc780e083b6c30eefb74b (patch) | |
| tree | ef499cfba7fd085c22b7c59a66f2ee539e1f8d47 /tests/auto/headers | |
| parent | 2f3a783d8399f13a1e21ac47ffd8b8eb373c4e01 (diff) | |
| download | Qt-374c5f5c5ac72f1d564cc780e083b6c30eefb74b.zip Qt-374c5f5c5ac72f1d564cc780e083b6c30eefb74b.tar.gz Qt-374c5f5c5ac72f1d564cc780e083b6c30eefb74b.tar.bz2 | |
license: Fix Blackberry/QNX license headers
These files where skipped when tst_license was enabled a while
ago since they had a different license header that didn't match
our test.
Fix these licenses and stop skipping them in tst_license.cpp
Change-Id: I14b2aa1b7c794894c2c74aedab01ff8667621003
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'tests/auto/headers')
| -rw-r--r-- | tests/auto/headers/tst_headers.cpp | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/tests/auto/headers/tst_headers.cpp b/tests/auto/headers/tst_headers.cpp index 6f4a9ad..44f555b 100644 --- a/tests/auto/headers/tst_headers.cpp +++ b/tests/auto/headers/tst_headers.cpp @@ -232,23 +232,6 @@ void tst_Headers::licenseCheck() return; } - // Files for QNX follow the Qt5 license header, so skipping them for now - if (sourceFile.contains("/src/plugins/platforms/blackberry/")) { - return; - } - - if (sourceFile.endsWith("mkspecs/unsupported/blackberry-armv7le-qcc/qplatformdefs.h") - || sourceFile.endsWith("mkspecs/unsupported/blackberry-x86-qcc/qplatformdefs.h") - || sourceFile.endsWith("mkspecs/unsupported/qnx-armv7le-qcc/qplatformdefs.h") - || sourceFile.endsWith("mkspecs/unsupported/qnx-x86-qcc/qplatformdefs.h") - || sourceFile.endsWith("src/corelib/kernel/qeventdispatcher_blackberry.cpp") - || sourceFile.endsWith("src/corelib/kernel/qeventdispatcher_blackberry_p.h") - || sourceFile.endsWith("src/gui/kernel/qeventdispatcher_blackberry_qpa.cpp") - || sourceFile.endsWith("src/gui/kernel/qeventdispatcher_blackberry_qpa_p.h") - || sourceFile.endsWith("src/gui/util/qdesktopservices_blackberry.cpp")) { - return; - } - // Compare the licensePattern ($QT_BEGIN_LICENSE:(LGPL|BSD|3RDPARTY|LGPL-ONLY|FDL)) pattern // with the file under test. This pattern can be found in either lines 5, 7 or 8 of the // license header |