From 374c5f5c5ac72f1d564cc780e083b6c30eefb74b Mon Sep 17 00:00:00 2001
From: Sergio Ahumada <sergio.ahumada@nokia.com>
Date: Sun, 12 Aug 2012 11:25:26 +0200
Subject: 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>
---
src/corelib/kernel/qeventdispatcher_blackberry.cpp | 4 ++--
src/corelib/kernel/qeventdispatcher_blackberry_p.h | 4 ++--
src/gui/kernel/qeventdispatcher_blackberry_qpa.cpp | 5 +----
src/gui/kernel/qeventdispatcher_blackberry_qpa_p.h | 5 ++---
src/gui/util/qdesktopservices_blackberry.cpp | 6 ++----
src/plugins/platforms/blackberry/main.cpp | 6 ++----
.../platforms/blackberry/qbbabstractvirtualkeyboard.cpp | 6 ++----
.../platforms/blackberry/qbbabstractvirtualkeyboard.h | 6 ++----
src/plugins/platforms/blackberry/qbbbpseventfilter.cpp | 6 ++----
src/plugins/platforms/blackberry/qbbbpseventfilter.h | 6 ++----
src/plugins/platforms/blackberry/qbbbuffer.cpp | 6 ++----
src/plugins/platforms/blackberry/qbbbuffer.h | 6 ++----
src/plugins/platforms/blackberry/qbbclipboard.cpp | 6 ++----
src/plugins/platforms/blackberry/qbbclipboard.h | 6 ++----
src/plugins/platforms/blackberry/qbbglcontext.cpp | 6 ++----
src/plugins/platforms/blackberry/qbbglcontext.h | 6 ++----
src/plugins/platforms/blackberry/qbbglwindowsurface.cpp | 6 ++----
src/plugins/platforms/blackberry/qbbglwindowsurface.h | 6 ++----
src/plugins/platforms/blackberry/qbbinputcontext.cpp | 6 ++----
src/plugins/platforms/blackberry/qbbinputcontext.h | 6 ++----
.../platforms/blackberry/qbbinputcontext_imf.cpp | 6 ++----
src/plugins/platforms/blackberry/qbbinputcontext_imf.h | 6 ++----
.../platforms/blackberry/qbbinputcontext_noimf.cpp | 6 ++----
.../platforms/blackberry/qbbinputcontext_noimf.h | 6 ++----
src/plugins/platforms/blackberry/qbbintegration.cpp | 6 ++----
src/plugins/platforms/blackberry/qbbintegration.h | 6 ++----
src/plugins/platforms/blackberry/qbbkeytranslator.h | 6 ++----
src/plugins/platforms/blackberry/qbblocalethread.cpp | 6 ++----
src/plugins/platforms/blackberry/qbblocalethread.h | 6 ++----
src/plugins/platforms/blackberry/qbbnativeinterface.cpp | 6 ++----
src/plugins/platforms/blackberry/qbbnativeinterface.h | 6 ++----
.../platforms/blackberry/qbbnavigatoreventhandler.cpp | 6 ++----
.../platforms/blackberry/qbbnavigatoreventhandler.h | 6 ++----
.../platforms/blackberry/qbbnavigatoreventnotifier.cpp | 6 ++----
.../platforms/blackberry/qbbnavigatoreventnotifier.h | 6 ++----
.../platforms/blackberry/qbbrasterwindowsurface.cpp | 6 ++----
.../platforms/blackberry/qbbrasterwindowsurface.h | 6 ++----
src/plugins/platforms/blackberry/qbbrootwindow.cpp | 8 +++-----
src/plugins/platforms/blackberry/qbbrootwindow.h | 8 +++-----
src/plugins/platforms/blackberry/qbbscreen.cpp | 6 ++----
src/plugins/platforms/blackberry/qbbscreen.h | 6 ++----
.../platforms/blackberry/qbbscreeneventhandler.cpp | 6 ++----
.../platforms/blackberry/qbbscreeneventhandler.h | 6 ++----
.../platforms/blackberry/qbbscreeneventthread.cpp | 6 ++----
src/plugins/platforms/blackberry/qbbscreeneventthread.h | 6 ++----
.../platforms/blackberry/qbbvirtualkeyboardbps.cpp | 6 ++----
.../platforms/blackberry/qbbvirtualkeyboardbps.h | 6 ++----
.../platforms/blackberry/qbbvirtualkeyboardpps.cpp | 6 ++----
.../platforms/blackberry/qbbvirtualkeyboardpps.h | 6 ++----
src/plugins/platforms/blackberry/qbbwindow.cpp | 6 ++----
src/plugins/platforms/blackberry/qbbwindow.h | 6 ++----
tests/auto/headers/tst_headers.cpp | 17 -----------------
52 files changed, 103 insertions(+), 218 deletions(-)
diff --git a/src/corelib/kernel/qeventdispatcher_blackberry.cpp b/src/corelib/kernel/qeventdispatcher_blackberry.cpp
index 9a9cb8a..6cb2785 100644
--- a/src/corelib/kernel/qeventdispatcher_blackberry.cpp
+++ b/src/corelib/kernel/qeventdispatcher_blackberry.cpp
@@ -1,7 +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 QtCore module of the Qt Toolkit.
**
diff --git a/src/corelib/kernel/qeventdispatcher_blackberry_p.h b/src/corelib/kernel/qeventdispatcher_blackberry_p.h
index 1d31f27..df359b8 100644
--- a/src/corelib/kernel/qeventdispatcher_blackberry_p.h
+++ b/src/corelib/kernel/qeventdispatcher_blackberry_p.h
@@ -1,7 +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 QtCore module of the Qt Toolkit.
**
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.
**
diff --git a/src/plugins/platforms/blackberry/main.cpp b/src/plugins/platforms/blackberry/main.cpp
index ff0baaa..cd9f455 100644
--- a/src/plugins/platforms/blackberry/main.cpp
+++ b/src/plugins/platforms/blackberry/main.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.
**
diff --git a/src/plugins/platforms/blackberry/qbbabstractvirtualkeyboard.cpp b/src/plugins/platforms/blackberry/qbbabstractvirtualkeyboard.cpp
index 9397a55..55b1a43 100644
--- a/src/plugins/platforms/blackberry/qbbabstractvirtualkeyboard.cpp
+++ b/src/plugins/platforms/blackberry/qbbabstractvirtualkeyboard.cpp
@@ -1,9 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2012 Research In Motion
-**
-** Contact: Research In Motion <blackberry-qt@qnx.com>
-** Contact: Klarälvdalens Datakonsult AB <info@kdab.com>
+** Copyright (C) 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.
**
diff --git a/src/plugins/platforms/blackberry/qbbabstractvirtualkeyboard.h b/src/plugins/platforms/blackberry/qbbabstractvirtualkeyboard.h
index cb35c12..5116237 100644
--- a/src/plugins/platforms/blackberry/qbbabstractvirtualkeyboard.h
+++ b/src/plugins/platforms/blackberry/qbbabstractvirtualkeyboard.h
@@ -1,9 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2012 Research In Motion
-**
-** Contact: Research In Motion <blackberry-qt@qnx.com>
-** Contact: Klarälvdalens Datakonsult AB <info@kdab.com>
+** Copyright (C) 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.
**
diff --git a/src/plugins/platforms/blackberry/qbbbpseventfilter.cpp b/src/plugins/platforms/blackberry/qbbbpseventfilter.cpp
index c2d3693..81d7265 100644
--- a/src/plugins/platforms/blackberry/qbbbpseventfilter.cpp
+++ b/src/plugins/platforms/blackberry/qbbbpseventfilter.cpp
@@ -1,9 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2012 Research In Motion
-**
-** Contact: Research In Motion <blackberry-qt@qnx.com>
-** Contact: Klarälvdalens Datakonsult AB <info@kdab.com>
+** Copyright (C) 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.
**
diff --git a/src/plugins/platforms/blackberry/qbbbpseventfilter.h b/src/plugins/platforms/blackberry/qbbbpseventfilter.h
index e47c756..1cfdd28 100644
--- a/src/plugins/platforms/blackberry/qbbbpseventfilter.h
+++ b/src/plugins/platforms/blackberry/qbbbpseventfilter.h
@@ -1,9 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2012 Research In Motion
-**
-** Contact: Research In Motion <blackberry-qt@qnx.com>
-** Contact: Klarälvdalens Datakonsult AB <info@kdab.com>
+** Copyright (C) 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.
**
diff --git a/src/plugins/platforms/blackberry/qbbbuffer.cpp b/src/plugins/platforms/blackberry/qbbbuffer.cpp
index 00476da..23942eb 100644
--- a/src/plugins/platforms/blackberry/qbbbuffer.cpp
+++ b/src/plugins/platforms/blackberry/qbbbuffer.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.
**
diff --git a/src/plugins/platforms/blackberry/qbbbuffer.h b/src/plugins/platforms/blackberry/qbbbuffer.h
index 70c7ee8..40c011b 100644
--- a/src/plugins/platforms/blackberry/qbbbuffer.h
+++ b/src/plugins/platforms/blackberry/qbbbuffer.h
@@ -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.
**
diff --git a/src/plugins/platforms/blackberry/qbbclipboard.cpp b/src/plugins/platforms/blackberry/qbbclipboard.cpp
index d540a98..1b7c696 100644
--- a/src/plugins/platforms/blackberry/qbbclipboard.cpp
+++ b/src/plugins/platforms/blackberry/qbbclipboard.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.
**
diff --git a/src/plugins/platforms/blackberry/qbbclipboard.h b/src/plugins/platforms/blackberry/qbbclipboard.h
index da4445b..5f1c819 100644
--- a/src/plugins/platforms/blackberry/qbbclipboard.h
+++ b/src/plugins/platforms/blackberry/qbbclipboard.h
@@ -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.
**
diff --git a/src/plugins/platforms/blackberry/qbbglcontext.cpp b/src/plugins/platforms/blackberry/qbbglcontext.cpp
index 9bdf783..c5c0ecc 100644
--- a/src/plugins/platforms/blackberry/qbbglcontext.cpp
+++ b/src/plugins/platforms/blackberry/qbbglcontext.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.
**
diff --git a/src/plugins/platforms/blackberry/qbbglcontext.h b/src/plugins/platforms/blackberry/qbbglcontext.h
index 80d4c53..83f2dcd 100644
--- a/src/plugins/platforms/blackberry/qbbglcontext.h
+++ b/src/plugins/platforms/blackberry/qbbglcontext.h
@@ -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.
**
diff --git a/src/plugins/platforms/blackberry/qbbglwindowsurface.cpp b/src/plugins/platforms/blackberry/qbbglwindowsurface.cpp
index b5a7083..2713866 100644
--- a/src/plugins/platforms/blackberry/qbbglwindowsurface.cpp
+++ b/src/plugins/platforms/blackberry/qbbglwindowsurface.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.
**
diff --git a/src/plugins/platforms/blackberry/qbbglwindowsurface.h b/src/plugins/platforms/blackberry/qbbglwindowsurface.h
index 5546432..12f6dbe 100644
--- a/src/plugins/platforms/blackberry/qbbglwindowsurface.h
+++ b/src/plugins/platforms/blackberry/qbbglwindowsurface.h
@@ -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.
**
diff --git a/src/plugins/platforms/blackberry/qbbinputcontext.cpp b/src/plugins/platforms/blackberry/qbbinputcontext.cpp
index a7c98f1..063c377 100644
--- a/src/plugins/platforms/blackberry/qbbinputcontext.cpp
+++ b/src/plugins/platforms/blackberry/qbbinputcontext.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.
**
diff --git a/src/plugins/platforms/blackberry/qbbinputcontext.h b/src/plugins/platforms/blackberry/qbbinputcontext.h
index 9845f1c..48a57b2 100644
--- a/src/plugins/platforms/blackberry/qbbinputcontext.h
+++ b/src/plugins/platforms/blackberry/qbbinputcontext.h
@@ -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.
**
diff --git a/src/plugins/platforms/blackberry/qbbinputcontext_imf.cpp b/src/plugins/platforms/blackberry/qbbinputcontext_imf.cpp
index 68c4785..8d6a044 100644
--- a/src/plugins/platforms/blackberry/qbbinputcontext_imf.cpp
+++ b/src/plugins/platforms/blackberry/qbbinputcontext_imf.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.
**
diff --git a/src/plugins/platforms/blackberry/qbbinputcontext_imf.h b/src/plugins/platforms/blackberry/qbbinputcontext_imf.h
index 435cbfe..b64a8dd 100644
--- a/src/plugins/platforms/blackberry/qbbinputcontext_imf.h
+++ b/src/plugins/platforms/blackberry/qbbinputcontext_imf.h
@@ -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.
**
diff --git a/src/plugins/platforms/blackberry/qbbinputcontext_noimf.cpp b/src/plugins/platforms/blackberry/qbbinputcontext_noimf.cpp
index 9f32170..5659f1a 100644
--- a/src/plugins/platforms/blackberry/qbbinputcontext_noimf.cpp
+++ b/src/plugins/platforms/blackberry/qbbinputcontext_noimf.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.
**
diff --git a/src/plugins/platforms/blackberry/qbbinputcontext_noimf.h b/src/plugins/platforms/blackberry/qbbinputcontext_noimf.h
index 3816d12..4c26274 100644
--- a/src/plugins/platforms/blackberry/qbbinputcontext_noimf.h
+++ b/src/plugins/platforms/blackberry/qbbinputcontext_noimf.h
@@ -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.
**
diff --git a/src/plugins/platforms/blackberry/qbbintegration.cpp b/src/plugins/platforms/blackberry/qbbintegration.cpp
index 7e73e47..6733f18 100644
--- a/src/plugins/platforms/blackberry/qbbintegration.cpp
+++ b/src/plugins/platforms/blackberry/qbbintegration.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.
**
diff --git a/src/plugins/platforms/blackberry/qbbintegration.h b/src/plugins/platforms/blackberry/qbbintegration.h
index 8fabe3f..be82087 100644
--- a/src/plugins/platforms/blackberry/qbbintegration.h
+++ b/src/plugins/platforms/blackberry/qbbintegration.h
@@ -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.
**
diff --git a/src/plugins/platforms/blackberry/qbbkeytranslator.h b/src/plugins/platforms/blackberry/qbbkeytranslator.h
index 88c9660..2134373 100644
--- a/src/plugins/platforms/blackberry/qbbkeytranslator.h
+++ b/src/plugins/platforms/blackberry/qbbkeytranslator.h
@@ -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.
**
diff --git a/src/plugins/platforms/blackberry/qbblocalethread.cpp b/src/plugins/platforms/blackberry/qbblocalethread.cpp
index 1da94e2..0ac4585 100644
--- a/src/plugins/platforms/blackberry/qbblocalethread.cpp
+++ b/src/plugins/platforms/blackberry/qbblocalethread.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.
**
diff --git a/src/plugins/platforms/blackberry/qbblocalethread.h b/src/plugins/platforms/blackberry/qbblocalethread.h
index 8a0413f..e79711f 100644
--- a/src/plugins/platforms/blackberry/qbblocalethread.h
+++ b/src/plugins/platforms/blackberry/qbblocalethread.h
@@ -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.
**
diff --git a/src/plugins/platforms/blackberry/qbbnativeinterface.cpp b/src/plugins/platforms/blackberry/qbbnativeinterface.cpp
index 8cd931b..766c776 100644
--- a/src/plugins/platforms/blackberry/qbbnativeinterface.cpp
+++ b/src/plugins/platforms/blackberry/qbbnativeinterface.cpp
@@ -1,9 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2012 Research In Motion
-**
-** Contact: Research In Motion <blackberry-qt@qnx.com>
-** Contact: Klarälvdalens Datakonsult AB <info@kdab.com>
+** Copyright (C) 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.
**
diff --git a/src/plugins/platforms/blackberry/qbbnativeinterface.h b/src/plugins/platforms/blackberry/qbbnativeinterface.h
index 5a7a865..6cf30c4 100644
--- a/src/plugins/platforms/blackberry/qbbnativeinterface.h
+++ b/src/plugins/platforms/blackberry/qbbnativeinterface.h
@@ -1,9 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2012 Research In Motion
-**
-** Contact: Research In Motion <blackberry-qt@qnx.com>
-** Contact: Klarälvdalens Datakonsult AB <info@kdab.com>
+** Copyright (C) 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.
**
diff --git a/src/plugins/platforms/blackberry/qbbnavigatoreventhandler.cpp b/src/plugins/platforms/blackberry/qbbnavigatoreventhandler.cpp
index 449bf84..172025a 100644
--- a/src/plugins/platforms/blackberry/qbbnavigatoreventhandler.cpp
+++ b/src/plugins/platforms/blackberry/qbbnavigatoreventhandler.cpp
@@ -1,9 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2012 Research In Motion
-**
-** Contact: Research In Motion <blackberry-qt@qnx.com>
-** Contact: Klarälvdalens Datakonsult AB <info@kdab.com>
+** Copyright (C) 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.
**
diff --git a/src/plugins/platforms/blackberry/qbbnavigatoreventhandler.h b/src/plugins/platforms/blackberry/qbbnavigatoreventhandler.h
index a0b3622..80e2196 100644
--- a/src/plugins/platforms/blackberry/qbbnavigatoreventhandler.h
+++ b/src/plugins/platforms/blackberry/qbbnavigatoreventhandler.h
@@ -1,9 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2012 Research In Motion
-**
-** Contact: Research In Motion <blackberry-qt@qnx.com>
-** Contact: Klarälvdalens Datakonsult AB <info@kdab.com>
+** Copyright (C) 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.
**
diff --git a/src/plugins/platforms/blackberry/qbbnavigatoreventnotifier.cpp b/src/plugins/platforms/blackberry/qbbnavigatoreventnotifier.cpp
index 63ae8fb..94f0cb5 100644
--- a/src/plugins/platforms/blackberry/qbbnavigatoreventnotifier.cpp
+++ b/src/plugins/platforms/blackberry/qbbnavigatoreventnotifier.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.
**
diff --git a/src/plugins/platforms/blackberry/qbbnavigatoreventnotifier.h b/src/plugins/platforms/blackberry/qbbnavigatoreventnotifier.h
index 2f9e607..99d613a 100644
--- a/src/plugins/platforms/blackberry/qbbnavigatoreventnotifier.h
+++ b/src/plugins/platforms/blackberry/qbbnavigatoreventnotifier.h
@@ -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.
**
diff --git a/src/plugins/platforms/blackberry/qbbrasterwindowsurface.cpp b/src/plugins/platforms/blackberry/qbbrasterwindowsurface.cpp
index 548ca4d..be1e7fd 100644
--- a/src/plugins/platforms/blackberry/qbbrasterwindowsurface.cpp
+++ b/src/plugins/platforms/blackberry/qbbrasterwindowsurface.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.
**
diff --git a/src/plugins/platforms/blackberry/qbbrasterwindowsurface.h b/src/plugins/platforms/blackberry/qbbrasterwindowsurface.h
index 02c8eb3..30030c3 100644
--- a/src/plugins/platforms/blackberry/qbbrasterwindowsurface.h
+++ b/src/plugins/platforms/blackberry/qbbrasterwindowsurface.h
@@ -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.
**
diff --git a/src/plugins/platforms/blackberry/qbbrootwindow.cpp b/src/plugins/platforms/blackberry/qbbrootwindow.cpp
index 61ab9aa..cc2543a 100644
--- a/src/plugins/platforms/blackberry/qbbrootwindow.cpp
+++ b/src/plugins/platforms/blackberry/qbbrootwindow.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 plugins of the Qt Toolkit.
**
diff --git a/src/plugins/platforms/blackberry/qbbrootwindow.h b/src/plugins/platforms/blackberry/qbbrootwindow.h
index 9e81449..bac5ca4 100644
--- a/src/plugins/platforms/blackberry/qbbrootwindow.h
+++ b/src/plugins/platforms/blackberry/qbbrootwindow.h
@@ -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 plugins of the Qt Toolkit.
**
diff --git a/src/plugins/platforms/blackberry/qbbscreen.cpp b/src/plugins/platforms/blackberry/qbbscreen.cpp
index d36723a..54ae8e1 100644
--- a/src/plugins/platforms/blackberry/qbbscreen.cpp
+++ b/src/plugins/platforms/blackberry/qbbscreen.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.
**
diff --git a/src/plugins/platforms/blackberry/qbbscreen.h b/src/plugins/platforms/blackberry/qbbscreen.h
index 3d67b69..d74a45c 100644
--- a/src/plugins/platforms/blackberry/qbbscreen.h
+++ b/src/plugins/platforms/blackberry/qbbscreen.h
@@ -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.
**
diff --git a/src/plugins/platforms/blackberry/qbbscreeneventhandler.cpp b/src/plugins/platforms/blackberry/qbbscreeneventhandler.cpp
index a12f71b..98ba73f 100644
--- a/src/plugins/platforms/blackberry/qbbscreeneventhandler.cpp
+++ b/src/plugins/platforms/blackberry/qbbscreeneventhandler.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.
**
diff --git a/src/plugins/platforms/blackberry/qbbscreeneventhandler.h b/src/plugins/platforms/blackberry/qbbscreeneventhandler.h
index d6c253d..63910fc 100644
--- a/src/plugins/platforms/blackberry/qbbscreeneventhandler.h
+++ b/src/plugins/platforms/blackberry/qbbscreeneventhandler.h
@@ -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.
**
diff --git a/src/plugins/platforms/blackberry/qbbscreeneventthread.cpp b/src/plugins/platforms/blackberry/qbbscreeneventthread.cpp
index f6dfcb2..e1ef4fb 100644
--- a/src/plugins/platforms/blackberry/qbbscreeneventthread.cpp
+++ b/src/plugins/platforms/blackberry/qbbscreeneventthread.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.
**
diff --git a/src/plugins/platforms/blackberry/qbbscreeneventthread.h b/src/plugins/platforms/blackberry/qbbscreeneventthread.h
index 0cc2355..ae2637e 100644
--- a/src/plugins/platforms/blackberry/qbbscreeneventthread.h
+++ b/src/plugins/platforms/blackberry/qbbscreeneventthread.h
@@ -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.
**
diff --git a/src/plugins/platforms/blackberry/qbbvirtualkeyboardbps.cpp b/src/plugins/platforms/blackberry/qbbvirtualkeyboardbps.cpp
index c364f3b..070ee0c 100644
--- a/src/plugins/platforms/blackberry/qbbvirtualkeyboardbps.cpp
+++ b/src/plugins/platforms/blackberry/qbbvirtualkeyboardbps.cpp
@@ -1,9 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2012 Research In Motion
-**
-** Contact: Research In Motion <blackberry-qt@qnx.com>
-** Contact: Klarälvdalens Datakonsult AB <info@kdab.com>
+** Copyright (C) 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.
**
diff --git a/src/plugins/platforms/blackberry/qbbvirtualkeyboardbps.h b/src/plugins/platforms/blackberry/qbbvirtualkeyboardbps.h
index 89b5cca..40d3b67 100644
--- a/src/plugins/platforms/blackberry/qbbvirtualkeyboardbps.h
+++ b/src/plugins/platforms/blackberry/qbbvirtualkeyboardbps.h
@@ -1,9 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2012 Research In Motion
-**
-** Contact: Research In Motion <blackberry-qt@qnx.com>
-** Contact: Klarälvdalens Datakonsult AB <info@kdab.com>
+** Copyright (C) 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.
**
diff --git a/src/plugins/platforms/blackberry/qbbvirtualkeyboardpps.cpp b/src/plugins/platforms/blackberry/qbbvirtualkeyboardpps.cpp
index 6504c7e..ee53036 100644
--- a/src/plugins/platforms/blackberry/qbbvirtualkeyboardpps.cpp
+++ b/src/plugins/platforms/blackberry/qbbvirtualkeyboardpps.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.
**
diff --git a/src/plugins/platforms/blackberry/qbbvirtualkeyboardpps.h b/src/plugins/platforms/blackberry/qbbvirtualkeyboardpps.h
index 0dd3c42..a718e49 100644
--- a/src/plugins/platforms/blackberry/qbbvirtualkeyboardpps.h
+++ b/src/plugins/platforms/blackberry/qbbvirtualkeyboardpps.h
@@ -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.
**
diff --git a/src/plugins/platforms/blackberry/qbbwindow.cpp b/src/plugins/platforms/blackberry/qbbwindow.cpp
index c57c556..0c510e8 100644
--- a/src/plugins/platforms/blackberry/qbbwindow.cpp
+++ b/src/plugins/platforms/blackberry/qbbwindow.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.
**
diff --git a/src/plugins/platforms/blackberry/qbbwindow.h b/src/plugins/platforms/blackberry/qbbwindow.h
index 91a8f26..8964df4 100644
--- a/src/plugins/platforms/blackberry/qbbwindow.h
+++ b/src/plugins/platforms/blackberry/qbbwindow.h
@@ -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.
**
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
--
cgit v0.12