summaryrefslogtreecommitdiffstats
path: root/config.profiles/harmattan
diff options
context:
space:
mode:
authorJyri Tahtela <jyri.tahtela@nokia.com>2011-05-24 12:34:08 +0300
committerJyri Tahtela <jyri.tahtela@nokia.com>2011-05-24 12:34:08 +0300
commitf9f395c28b8ce66c0605607ea76ad1099d45a6c9 (patch)
tree1d34c2179af5395247b3926ce4d6ea474ae99265 /config.profiles/harmattan
parent60ab28f2995b166375979f53486e4f5335e7c83e (diff)
Update licenseheader text in source files for qtbase Qt module
Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
Diffstat (limited to 'config.profiles/harmattan')
-rwxr-xr-xconfig.profiles/harmattan/configure-pulse.sh34
-rw-r--r--config.profiles/harmattan/manpages/lrelease.134
-rw-r--r--config.profiles/harmattan/manpages/lupdate.134
-rw-r--r--config.profiles/harmattan/manpages/moc.134
-rw-r--r--config.profiles/harmattan/manpages/qmake.134
-rw-r--r--config.profiles/harmattan/manpages/qtconfig.134
-rw-r--r--config.profiles/harmattan/manpages/uic.134
-rw-r--r--config.profiles/harmattan/mkspecs/linux-g++-cross/qplatformdefs.h36
-rw-r--r--config.profiles/harmattan/readdir-hppa-test.c34
-rwxr-xr-xconfig.profiles/harmattan/tests/create_tests_xml34
-rw-r--r--config.profiles/harmattan/tests/maemo_tests.prf36
11 files changed, 189 insertions, 189 deletions
diff --git a/config.profiles/harmattan/configure-pulse.sh b/config.profiles/harmattan/configure-pulse.sh
index bc1615b151..7940d336ea 100755
--- a/config.profiles/harmattan/configure-pulse.sh
+++ b/config.profiles/harmattan/configure-pulse.sh
@@ -8,29 +8,29 @@
## This file is the build configuration utility of the Qt Toolkit.
##
## $QT_BEGIN_LICENSE:LGPL$
-## No Commercial Usage
-## This file contains pre-release code and may not be distributed.
-## You may use this file in accordance with the terms and conditions
-## contained in the Technology Preview License Agreement accompanying
-## this package.
-##
## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 2.1 as published by the Free Software
-## Foundation and appearing in the file LICENSE.LGPL included in the
-## packaging of this file. Please review the following information to
-## ensure the GNU Lesser General Public License version 2.1 requirements
-## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+## This file may be used under the terms of the GNU Lesser General Public
+## License version 2.1 as published by the Free Software Foundation and
+## appearing in the file LICENSE.LGPL included in the packaging of this
+## file. Please review the following information to ensure the GNU Lesser
+## General Public License version 2.1 requirements will be met:
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
##
## In addition, as a special exception, Nokia gives you certain additional
-## rights. These rights are described in the Nokia Qt LGPL Exception
+## rights. These rights are described in the Nokia Qt LGPL Exception
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
##
-## If you have questions regarding the use of this file, please contact
-## Nokia at qt-info@nokia.com.
-##
-##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU General
+## Public License version 3.0 as published by the Free Software Foundation
+## and appearing in the file LICENSE.GPL included in the packaging of this
+## file. Please review the following information to ensure the GNU General
+## Public License version 3.0 requirements will be met:
+## http://www.gnu.org/copyleft/gpl.html.
##
+## Other Usage
+## Alternatively, this file may be used in accordance with the terms and
+## conditions contained in a signed written agreement between you and Nokia.
##
##
##
diff --git a/config.profiles/harmattan/manpages/lrelease.1 b/config.profiles/harmattan/manpages/lrelease.1
index 79a10fed89..30e58e1b83 100644
--- a/config.profiles/harmattan/manpages/lrelease.1
+++ b/config.profiles/harmattan/manpages/lrelease.1
@@ -7,29 +7,29 @@
.\" This file is part of the QtGui module of the Qt Toolkit.
.\"
.\" $QT_BEGIN_LICENSE:LGPL$
-.\" No Commercial Usage
-.\" This file contains pre-release code and may not be distributed.
-.\" You may use this file in accordance with the terms and conditions
-.\" contained in the Technology Preview License Agreement accompanying
-.\" this package.
-.\"
.\" GNU Lesser General Public License Usage
-.\" Alternatively, this file may be used under the terms of the GNU Lesser
-.\" General Public License version 2.1 as published by the Free Software
-.\" Foundation and appearing in the file LICENSE.LGPL included in the
-.\" packaging of this file. Please review the following information to
-.\" ensure the GNU Lesser General Public License version 2.1 requirements
-.\" will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+.\" This file may be used under the terms of the GNU Lesser General Public
+.\" License version 2.1 as published by the Free Software Foundation and
+.\" appearing in the file LICENSE.LGPL included in the packaging of this
+.\" file. Please review the following information to ensure the GNU Lesser
+.\" General Public License version 2.1 requirements will be met:
+.\" http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
.\"
.\" In addition, as a special exception, Nokia gives you certain additional
-.\" rights. These rights are described in the Nokia Qt LGPL Exception
+.\" rights. These rights are described in the Nokia Qt LGPL Exception
.\" version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
.\"
-.\" If you have questions regarding the use of this file, please contact
-.\" Nokia at qt-info@nokia.com.
-.\"
-.\"
+.\" GNU General Public License Usage
+.\" Alternatively, this file may be used under the terms of the GNU General
+.\" Public License version 3.0 as published by the Free Software Foundation
+.\" and appearing in the file LICENSE.GPL included in the packaging of this
+.\" file. Please review the following information to ensure the GNU General
+.\" Public License version 3.0 requirements will be met:
+.\" http://www.gnu.org/copyleft/gpl.html.
.\"
+.\" Other Usage
+.\" Alternatively, this file may be used in accordance with the terms and
+.\" conditions contained in a signed written agreement between you and Nokia.
.\"
.\"
.\"
diff --git a/config.profiles/harmattan/manpages/lupdate.1 b/config.profiles/harmattan/manpages/lupdate.1
index c0771dfae9..ff049b3312 100644
--- a/config.profiles/harmattan/manpages/lupdate.1
+++ b/config.profiles/harmattan/manpages/lupdate.1
@@ -7,29 +7,29 @@
.\" This file is part of the QtGui module of the Qt Toolkit.
.\"
.\" $QT_BEGIN_LICENSE:LGPL$
-.\" No Commercial Usage
-.\" This file contains pre-release code and may not be distributed.
-.\" You may use this file in accordance with the terms and conditions
-.\" contained in the Technology Preview License Agreement accompanying
-.\" this package.
-.\"
.\" GNU Lesser General Public License Usage
-.\" Alternatively, this file may be used under the terms of the GNU Lesser
-.\" General Public License version 2.1 as published by the Free Software
-.\" Foundation and appearing in the file LICENSE.LGPL included in the
-.\" packaging of this file. Please review the following information to
-.\" ensure the GNU Lesser General Public License version 2.1 requirements
-.\" will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+.\" This file may be used under the terms of the GNU Lesser General Public
+.\" License version 2.1 as published by the Free Software Foundation and
+.\" appearing in the file LICENSE.LGPL included in the packaging of this
+.\" file. Please review the following information to ensure the GNU Lesser
+.\" General Public License version 2.1 requirements will be met:
+.\" http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
.\"
.\" In addition, as a special exception, Nokia gives you certain additional
-.\" rights. These rights are described in the Nokia Qt LGPL Exception
+.\" rights. These rights are described in the Nokia Qt LGPL Exception
.\" version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
.\"
-.\" If you have questions regarding the use of this file, please contact
-.\" Nokia at qt-info@nokia.com.
-.\"
-.\"
+.\" GNU General Public License Usage
+.\" Alternatively, this file may be used under the terms of the GNU General
+.\" Public License version 3.0 as published by the Free Software Foundation
+.\" and appearing in the file LICENSE.GPL included in the packaging of this
+.\" file. Please review the following information to ensure the GNU General
+.\" Public License version 3.0 requirements will be met:
+.\" http://www.gnu.org/copyleft/gpl.html.
.\"
+.\" Other Usage
+.\" Alternatively, this file may be used in accordance with the terms and
+.\" conditions contained in a signed written agreement between you and Nokia.
.\"
.\"
.\"
diff --git a/config.profiles/harmattan/manpages/moc.1 b/config.profiles/harmattan/manpages/moc.1
index a11e101d19..522fd08777 100644
--- a/config.profiles/harmattan/manpages/moc.1
+++ b/config.profiles/harmattan/manpages/moc.1
@@ -7,29 +7,29 @@
.\" This file is part of the QtGui module of the Qt Toolkit.
.\"
.\" $QT_BEGIN_LICENSE:LGPL$
-.\" No Commercial Usage
-.\" This file contains pre-release code and may not be distributed.
-.\" You may use this file in accordance with the terms and conditions
-.\" contained in the Technology Preview License Agreement accompanying
-.\" this package.
-.\"
.\" GNU Lesser General Public License Usage
-.\" Alternatively, this file may be used under the terms of the GNU Lesser
-.\" General Public License version 2.1 as published by the Free Software
-.\" Foundation and appearing in the file LICENSE.LGPL included in the
-.\" packaging of this file. Please review the following information to
-.\" ensure the GNU Lesser General Public License version 2.1 requirements
-.\" will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+.\" This file may be used under the terms of the GNU Lesser General Public
+.\" License version 2.1 as published by the Free Software Foundation and
+.\" appearing in the file LICENSE.LGPL included in the packaging of this
+.\" file. Please review the following information to ensure the GNU Lesser
+.\" General Public License version 2.1 requirements will be met:
+.\" http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
.\"
.\" In addition, as a special exception, Nokia gives you certain additional
-.\" rights. These rights are described in the Nokia Qt LGPL Exception
+.\" rights. These rights are described in the Nokia Qt LGPL Exception
.\" version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
.\"
-.\" If you have questions regarding the use of this file, please contact
-.\" Nokia at qt-info@nokia.com.
-.\"
-.\"
+.\" GNU General Public License Usage
+.\" Alternatively, this file may be used under the terms of the GNU General
+.\" Public License version 3.0 as published by the Free Software Foundation
+.\" and appearing in the file LICENSE.GPL included in the packaging of this
+.\" file. Please review the following information to ensure the GNU General
+.\" Public License version 3.0 requirements will be met:
+.\" http://www.gnu.org/copyleft/gpl.html.
.\"
+.\" Other Usage
+.\" Alternatively, this file may be used in accordance with the terms and
+.\" conditions contained in a signed written agreement between you and Nokia.
.\"
.\"
.\"
diff --git a/config.profiles/harmattan/manpages/qmake.1 b/config.profiles/harmattan/manpages/qmake.1
index b6e2c30862..571cd707ad 100644
--- a/config.profiles/harmattan/manpages/qmake.1
+++ b/config.profiles/harmattan/manpages/qmake.1
@@ -7,29 +7,29 @@
.\" This file is part of the QtGui module of the Qt Toolkit.
.\"
.\" $QT_BEGIN_LICENSE:LGPL$
-.\" No Commercial Usage
-.\" This file contains pre-release code and may not be distributed.
-.\" You may use this file in accordance with the terms and conditions
-.\" contained in the Technology Preview License Agreement accompanying
-.\" this package.
-.\"
.\" GNU Lesser General Public License Usage
-.\" Alternatively, this file may be used under the terms of the GNU Lesser
-.\" General Public License version 2.1 as published by the Free Software
-.\" Foundation and appearing in the file LICENSE.LGPL included in the
-.\" packaging of this file. Please review the following information to
-.\" ensure the GNU Lesser General Public License version 2.1 requirements
-.\" will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+.\" This file may be used under the terms of the GNU Lesser General Public
+.\" License version 2.1 as published by the Free Software Foundation and
+.\" appearing in the file LICENSE.LGPL included in the packaging of this
+.\" file. Please review the following information to ensure the GNU Lesser
+.\" General Public License version 2.1 requirements will be met:
+.\" http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
.\"
.\" In addition, as a special exception, Nokia gives you certain additional
-.\" rights. These rights are described in the Nokia Qt LGPL Exception
+.\" rights. These rights are described in the Nokia Qt LGPL Exception
.\" version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
.\"
-.\" If you have questions regarding the use of this file, please contact
-.\" Nokia at qt-info@nokia.com.
-.\"
-.\"
+.\" GNU General Public License Usage
+.\" Alternatively, this file may be used under the terms of the GNU General
+.\" Public License version 3.0 as published by the Free Software Foundation
+.\" and appearing in the file LICENSE.GPL included in the packaging of this
+.\" file. Please review the following information to ensure the GNU General
+.\" Public License version 3.0 requirements will be met:
+.\" http://www.gnu.org/copyleft/gpl.html.
.\"
+.\" Other Usage
+.\" Alternatively, this file may be used in accordance with the terms and
+.\" conditions contained in a signed written agreement between you and Nokia.
.\"
.\"
.\"
diff --git a/config.profiles/harmattan/manpages/qtconfig.1 b/config.profiles/harmattan/manpages/qtconfig.1
index 854c88fff7..977c357fbe 100644
--- a/config.profiles/harmattan/manpages/qtconfig.1
+++ b/config.profiles/harmattan/manpages/qtconfig.1
@@ -7,29 +7,29 @@
.\" This file is part of the QtGui module of the Qt Toolkit.
.\"
.\" $QT_BEGIN_LICENSE:LGPL$
-.\" No Commercial Usage
-.\" This file contains pre-release code and may not be distributed.
-.\" You may use this file in accordance with the terms and conditions
-.\" contained in the Technology Preview License Agreement accompanying
-.\" this package.
-.\"
.\" GNU Lesser General Public License Usage
-.\" Alternatively, this file may be used under the terms of the GNU Lesser
-.\" General Public License version 2.1 as published by the Free Software
-.\" Foundation and appearing in the file LICENSE.LGPL included in the
-.\" packaging of this file. Please review the following information to
-.\" ensure the GNU Lesser General Public License version 2.1 requirements
-.\" will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+.\" This file may be used under the terms of the GNU Lesser General Public
+.\" License version 2.1 as published by the Free Software Foundation and
+.\" appearing in the file LICENSE.LGPL included in the packaging of this
+.\" file. Please review the following information to ensure the GNU Lesser
+.\" General Public License version 2.1 requirements will be met:
+.\" http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
.\"
.\" In addition, as a special exception, Nokia gives you certain additional
-.\" rights. These rights are described in the Nokia Qt LGPL Exception
+.\" rights. These rights are described in the Nokia Qt LGPL Exception
.\" version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
.\"
-.\" If you have questions regarding the use of this file, please contact
-.\" Nokia at qt-info@nokia.com.
-.\"
-.\"
+.\" GNU General Public License Usage
+.\" Alternatively, this file may be used under the terms of the GNU General
+.\" Public License version 3.0 as published by the Free Software Foundation
+.\" and appearing in the file LICENSE.GPL included in the packaging of this
+.\" file. Please review the following information to ensure the GNU General
+.\" Public License version 3.0 requirements will be met:
+.\" http://www.gnu.org/copyleft/gpl.html.
.\"
+.\" Other Usage
+.\" Alternatively, this file may be used in accordance with the terms and
+.\" conditions contained in a signed written agreement between you and Nokia.
.\"
.\"
.\"
diff --git a/config.profiles/harmattan/manpages/uic.1 b/config.profiles/harmattan/manpages/uic.1
index b7819008d6..541d331b19 100644
--- a/config.profiles/harmattan/manpages/uic.1
+++ b/config.profiles/harmattan/manpages/uic.1
@@ -7,29 +7,29 @@
.\" This file is part of the QtGui module of the Qt Toolkit.
.\"
.\" $QT_BEGIN_LICENSE:LGPL$
-.\" No Commercial Usage
-.\" This file contains pre-release code and may not be distributed.
-.\" You may use this file in accordance with the terms and conditions
-.\" contained in the Technology Preview License Agreement accompanying
-.\" this package.
-.\"
.\" GNU Lesser General Public License Usage
-.\" Alternatively, this file may be used under the terms of the GNU Lesser
-.\" General Public License version 2.1 as published by the Free Software
-.\" Foundation and appearing in the file LICENSE.LGPL included in the
-.\" packaging of this file. Please review the following information to
-.\" ensure the GNU Lesser General Public License version 2.1 requirements
-.\" will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+.\" This file may be used under the terms of the GNU Lesser General Public
+.\" License version 2.1 as published by the Free Software Foundation and
+.\" appearing in the file LICENSE.LGPL included in the packaging of this
+.\" file. Please review the following information to ensure the GNU Lesser
+.\" General Public License version 2.1 requirements will be met:
+.\" http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
.\"
.\" In addition, as a special exception, Nokia gives you certain additional
-.\" rights. These rights are described in the Nokia Qt LGPL Exception
+.\" rights. These rights are described in the Nokia Qt LGPL Exception
.\" version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
.\"
-.\" If you have questions regarding the use of this file, please contact
-.\" Nokia at qt-info@nokia.com.
-.\"
-.\"
+.\" GNU General Public License Usage
+.\" Alternatively, this file may be used under the terms of the GNU General
+.\" Public License version 3.0 as published by the Free Software Foundation
+.\" and appearing in the file LICENSE.GPL included in the packaging of this
+.\" file. Please review the following information to ensure the GNU General
+.\" Public License version 3.0 requirements will be met:
+.\" http://www.gnu.org/copyleft/gpl.html.
.\"
+.\" Other Usage
+.\" Alternatively, this file may be used in accordance with the terms and
+.\" conditions contained in a signed written agreement between you and Nokia.
.\"
.\"
.\"
diff --git a/config.profiles/harmattan/mkspecs/linux-g++-cross/qplatformdefs.h b/config.profiles/harmattan/mkspecs/linux-g++-cross/qplatformdefs.h
index 857eaf3ad3..57a9ce52a7 100644
--- a/config.profiles/harmattan/mkspecs/linux-g++-cross/qplatformdefs.h
+++ b/config.profiles/harmattan/mkspecs/linux-g++-cross/qplatformdefs.h
@@ -7,29 +7,29 @@
** This file is part of the qmake spec of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
+** rights. These rights are described in the Nokia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
**
**
**
diff --git a/config.profiles/harmattan/readdir-hppa-test.c b/config.profiles/harmattan/readdir-hppa-test.c
index 11628405a4..52c7d14b50 100644
--- a/config.profiles/harmattan/readdir-hppa-test.c
+++ b/config.profiles/harmattan/readdir-hppa-test.c
@@ -7,29 +7,29 @@
** This file is part of the config.tests of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
+** rights. These rights are described in the Nokia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
**
**
**
diff --git a/config.profiles/harmattan/tests/create_tests_xml b/config.profiles/harmattan/tests/create_tests_xml
index f87263354f..c168654ae7 100755
--- a/config.profiles/harmattan/tests/create_tests_xml
+++ b/config.profiles/harmattan/tests/create_tests_xml
@@ -9,29 +9,29 @@
## This file is the build configuration utility of the Qt Toolkit.
##
## $QT_BEGIN_LICENSE:LGPL$
-## No Commercial Usage
-## This file contains pre-release code and may not be distributed.
-## You may use this file in accordance with the terms and conditions
-## contained in the Technology Preview License Agreement accompanying
-## this package.
-##
## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 2.1 as published by the Free Software
-## Foundation and appearing in the file LICENSE.LGPL included in the
-## packaging of this file. Please review the following information to
-## ensure the GNU Lesser General Public License version 2.1 requirements
-## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+## This file may be used under the terms of the GNU Lesser General Public
+## License version 2.1 as published by the Free Software Foundation and
+## appearing in the file LICENSE.LGPL included in the packaging of this
+## file. Please review the following information to ensure the GNU Lesser
+## General Public License version 2.1 requirements will be met:
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
##
## In addition, as a special exception, Nokia gives you certain additional
-## rights. These rights are described in the Nokia Qt LGPL Exception
+## rights. These rights are described in the Nokia Qt LGPL Exception
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
##
-## If you have questions regarding the use of this file, please contact
-## Nokia at qt-info@nokia.com.
-##
-##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU General
+## Public License version 3.0 as published by the Free Software Foundation
+## and appearing in the file LICENSE.GPL included in the packaging of this
+## file. Please review the following information to ensure the GNU General
+## Public License version 3.0 requirements will be met:
+## http://www.gnu.org/copyleft/gpl.html.
##
+## Other Usage
+## Alternatively, this file may be used in accordance with the terms and
+## conditions contained in a signed written agreement between you and Nokia.
##
##
##
diff --git a/config.profiles/harmattan/tests/maemo_tests.prf b/config.profiles/harmattan/tests/maemo_tests.prf
index 5608cd7c8e..3bdb80293b 100644
--- a/config.profiles/harmattan/tests/maemo_tests.prf
+++ b/config.profiles/harmattan/tests/maemo_tests.prf
@@ -7,29 +7,29 @@
## This file is the build configuration utility of the Qt Toolkit.
##
## $QT_BEGIN_LICENSE:LGPL$
-## No Commercial Usage
-## This file contains pre-release code and may not be distributed.
-## You may use this file in accordance with the terms and conditions
-## contained in the Technology Preview License Agreement accompanying
-## this package.
-##
## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 2.1 as published by the Free Software
-## Foundation and appearing in the file LICENSE.LGPL included in the
-## packaging of this file. Please review the following information to
-## ensure the GNU Lesser General Public License version 2.1 requirements
-## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+## This file may be used under the terms of the GNU Lesser General Public
+## License version 2.1 as published by the Free Software Foundation and
+## appearing in the file LICENSE.LGPL included in the packaging of this
+## file. Please review the following information to ensure the GNU Lesser
+## General Public License version 2.1 requirements will be met:
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
##
## In addition, as a special exception, Nokia gives you certain additional
-## rights. These rights are described in the Nokia Qt LGPL Exception
+## rights. These rights are described in the Nokia Qt LGPL Exception
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
##
-## If you have questions regarding the use of this file, please contact
-## Nokia at qt-info@nokia.com.
-##
-##
-##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU General
+## Public License version 3.0 as published by the Free Software Foundation
+## and appearing in the file LICENSE.GPL included in the packaging of this
+## file. Please review the following information to ensure the GNU General
+## Public License version 3.0 requirements will be met:
+## http://www.gnu.org/copyleft/gpl.html.
+##
+## Other Usage
+## Alternatively, this file may be used in accordance with the terms and
+## conditions contained in a signed written agreement between you and Nokia.
##
##
##