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 /src/gui | |
| 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 'src/gui')
| -rw-r--r-- | src/gui/kernel/qeventdispatcher_blackberry_qpa.cpp | 5 | ||||
| -rw-r--r-- | src/gui/kernel/qeventdispatcher_blackberry_qpa_p.h | 5 | ||||
| -rw-r--r-- | src/gui/util/qdesktopservices_blackberry.cpp | 6 |
3 files changed, 5 insertions, 11 deletions
diff --git a/src/gui/kernel/qeventdispatcher_blackberry_qpa.cpp b/src/gui/kernel/qeventdispatcher_blackberry_qpa.cpp index 1e18384..568893a 100644 --- a/src/gui/kernel/qeventdispatcher_blackberry_qpa.cpp +++ b/src/gui/kernel/qeventdispatcher_blackberry_qpa.cpp @@ -1,9 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Research In Motion -** Contact: Research In Motion <blackberry-qt@qnx.com> -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2012 Research In Motion <blackberry-qt@qnx.com> ** Contact: http://www.qt-project.org/ ** ** This file is part of the QtGui module of the Qt Toolkit. diff --git a/src/gui/kernel/qeventdispatcher_blackberry_qpa_p.h b/src/gui/kernel/qeventdispatcher_blackberry_qpa_p.h index 7c5b5a1..b9dcf39 100644 --- a/src/gui/kernel/qeventdispatcher_blackberry_qpa_p.h +++ b/src/gui/kernel/qeventdispatcher_blackberry_qpa_p.h @@ -1,8 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Research In Motion -** -** Contact: Research In Motion <blackberry-qt@qnx.com> +** Copyright (C) 2012 Research In Motion <blackberry-qt@qnx.com> +** Contact: http://www.qt-project.org/ ** ** This file is part of the QtGui module of the Qt Toolkit. ** diff --git a/src/gui/util/qdesktopservices_blackberry.cpp b/src/gui/util/qdesktopservices_blackberry.cpp index 8913e3f..fda5bc9 100644 --- a/src/gui/util/qdesktopservices_blackberry.cpp +++ b/src/gui/util/qdesktopservices_blackberry.cpp @@ -1,9 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2011 - 2012 Research In Motion -** -** Contact: Research In Motion <blackberry-qt@qnx.com> -** Contact: Klarälvdalens Datakonsult AB <info@kdab.com> +** Copyright (C) 2011 - 2012 Research In Motion <blackberry-qt@qnx.com> +** Contact: http://www.qt-project.org/ ** ** This file is part of the QtCore module of the Qt Toolkit. ** |