diff options
author | Iikka Eklund <iikka.eklund@digia.com> | 2012-09-25 12:31:19 +0300 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-09-29 07:57:45 +0200 |
commit | 619136931e2c985377348d196d488e429a4858d6 (patch) | |
tree | 627b1197a7888451c26df27dcd3b0d1e34c127ce /config.profiles | |
parent | 14dabf0f354b4f3817393d9b9e52473f88b896da (diff) | |
download | qt4-tools-619136931e2c985377348d196d488e429a4858d6.tar.gz |
Change copyrights from Nokia to Digia
Change copyrights and license headers from Nokia to Digia
Change-Id: I280c0a575987d1770e354b4948f1d4d767d711ea
Reviewed-by: Simo Fält <simo.falt@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Diffstat (limited to 'config.profiles')
-rwxr-xr-x | config.profiles/harmattan/configure-pulse.sh | 48 | ||||
-rw-r--r-- | config.profiles/harmattan/manpages/lrelease.1 | 48 | ||||
-rw-r--r-- | config.profiles/harmattan/manpages/lupdate.1 | 48 | ||||
-rw-r--r-- | config.profiles/harmattan/manpages/moc.1 | 48 | ||||
-rw-r--r-- | config.profiles/harmattan/manpages/qmake.1 | 48 | ||||
-rw-r--r-- | config.profiles/harmattan/manpages/qtconfig.1 | 48 | ||||
-rw-r--r-- | config.profiles/harmattan/manpages/uic.1 | 48 | ||||
-rw-r--r-- | config.profiles/harmattan/mkspecs/linux-g++-cross/qplatformdefs.h | 50 | ||||
-rw-r--r-- | config.profiles/harmattan/readdir-hppa-test.c | 48 | ||||
-rw-r--r-- | config.profiles/harmattan/tests/create_tests_xml | 48 | ||||
-rw-r--r-- | config.profiles/harmattan/tests/maemo_tests.prf | 50 | ||||
-rw-r--r-- | config.profiles/symbian/bld.inf | 4 | ||||
-rw-r--r-- | config.profiles/symbian/headerexport | 4 | ||||
-rw-r--r-- | config.profiles/symbian/qtconfig.flm | 2 |
14 files changed, 271 insertions, 271 deletions
diff --git a/config.profiles/harmattan/configure-pulse.sh b/config.profiles/harmattan/configure-pulse.sh index 819c2acd10..09933d2598 100755 --- a/config.profiles/harmattan/configure-pulse.sh +++ b/config.profiles/harmattan/configure-pulse.sh @@ -1,39 +1,39 @@ #/bin/sh ############################################################################# ## -## Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -## Contact: http://www.qt-project.org/ +## Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +## Contact: http://www.qt-project.org/legal ## ## This file is the build configuration utility of the Qt Toolkit. ## ## $QT_BEGIN_LICENSE:LGPL$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and Digia. For licensing terms and +## conditions see http://qt.digia.com/licensing. For further information +## use the contact form at http://qt.digia.com/contact-us. +## ## GNU Lesser General Public License Usage -## 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. +## 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. ## -## In addition, as a special exception, Nokia gives you certain additional -## rights. These rights are described in the Nokia Qt LGPL Exception +## In addition, as a special exception, Digia gives you certain additional +## rights. These rights are described in the Digia Qt LGPL Exception ## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ## ## 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. -## -## -## -## +## 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. ## ## ## $QT_END_LICENSE$ diff --git a/config.profiles/harmattan/manpages/lrelease.1 b/config.profiles/harmattan/manpages/lrelease.1 index a9d8f2cee2..2037bebeae 100644 --- a/config.profiles/harmattan/manpages/lrelease.1 +++ b/config.profiles/harmattan/manpages/lrelease.1 @@ -1,38 +1,38 @@ .TH lrelease 1 "18 October 2001" "Nokia Corporation and/or its subsidiary(-ies)" \" -*- nroff -*- .\" -.\" Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -.\" Contact: http://www.qt-project.org/ +.\" Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +.\" Contact: http://www.qt-project.org/legal .\" .\" This file is part of the QtGui module of the Qt Toolkit. .\" .\" $QT_BEGIN_LICENSE:LGPL$ +.\" Commercial License Usage +.\" Licensees holding valid commercial Qt licenses may use this file in +.\" accordance with the commercial license agreement provided with the +.\" Software or, alternatively, in accordance with the terms contained in +.\" a written agreement between you and Digia. For licensing terms and +.\" conditions see http://qt.digia.com/licensing. For further information +.\" use the contact form at http://qt.digia.com/contact-us. +.\" .\" GNU Lesser General Public License Usage -.\" 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. +.\" 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. .\" -.\" In addition, as a special exception, Nokia gives you certain additional -.\" rights. These rights are described in the Nokia Qt LGPL Exception +.\" In addition, as a special exception, Digia gives you certain additional +.\" rights. These rights are described in the Digia Qt LGPL Exception .\" version 1.1, included in the file LGPL_EXCEPTION.txt in this package. .\" .\" 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. -.\" -.\" -.\" -.\" +.\" 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. .\" .\" .\" $QT_END_LICENSE$ diff --git a/config.profiles/harmattan/manpages/lupdate.1 b/config.profiles/harmattan/manpages/lupdate.1 index 258148f9f5..7316cf2784 100644 --- a/config.profiles/harmattan/manpages/lupdate.1 +++ b/config.profiles/harmattan/manpages/lupdate.1 @@ -1,38 +1,38 @@ .TH lupdate 1 "18 October 2001" "Nokia Corporation and/or its subsidiary(-ies)" \" -*- nroff -*- .\" -.\" Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -.\" Contact: http://www.qt-project.org/ +.\" Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +.\" Contact: http://www.qt-project.org/legal .\" .\" This file is part of the QtGui module of the Qt Toolkit. .\" .\" $QT_BEGIN_LICENSE:LGPL$ +.\" Commercial License Usage +.\" Licensees holding valid commercial Qt licenses may use this file in +.\" accordance with the commercial license agreement provided with the +.\" Software or, alternatively, in accordance with the terms contained in +.\" a written agreement between you and Digia. For licensing terms and +.\" conditions see http://qt.digia.com/licensing. For further information +.\" use the contact form at http://qt.digia.com/contact-us. +.\" .\" GNU Lesser General Public License Usage -.\" 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. +.\" 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. .\" -.\" In addition, as a special exception, Nokia gives you certain additional -.\" rights. These rights are described in the Nokia Qt LGPL Exception +.\" In addition, as a special exception, Digia gives you certain additional +.\" rights. These rights are described in the Digia Qt LGPL Exception .\" version 1.1, included in the file LGPL_EXCEPTION.txt in this package. .\" .\" 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. -.\" -.\" -.\" -.\" +.\" 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. .\" .\" .\" $QT_END_LICENSE$ diff --git a/config.profiles/harmattan/manpages/moc.1 b/config.profiles/harmattan/manpages/moc.1 index a9d10eb9d2..65172e48e2 100644 --- a/config.profiles/harmattan/manpages/moc.1 +++ b/config.profiles/harmattan/manpages/moc.1 @@ -1,38 +1,38 @@ .TH moc 1 "24 June 2001" "Nokia Corporation and/or its subsidiary(-ies)" \" -*- nroff -*- .\" -.\" Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -.\" Contact: http://www.qt-project.org/ +.\" Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +.\" Contact: http://www.qt-project.org/legal .\" .\" This file is part of the QtGui module of the Qt Toolkit. .\" .\" $QT_BEGIN_LICENSE:LGPL$ +.\" Commercial License Usage +.\" Licensees holding valid commercial Qt licenses may use this file in +.\" accordance with the commercial license agreement provided with the +.\" Software or, alternatively, in accordance with the terms contained in +.\" a written agreement between you and Digia. For licensing terms and +.\" conditions see http://qt.digia.com/licensing. For further information +.\" use the contact form at http://qt.digia.com/contact-us. +.\" .\" GNU Lesser General Public License Usage -.\" 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. +.\" 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. .\" -.\" In addition, as a special exception, Nokia gives you certain additional -.\" rights. These rights are described in the Nokia Qt LGPL Exception +.\" In addition, as a special exception, Digia gives you certain additional +.\" rights. These rights are described in the Digia Qt LGPL Exception .\" version 1.1, included in the file LGPL_EXCEPTION.txt in this package. .\" .\" 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. -.\" -.\" -.\" -.\" +.\" 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. .\" .\" .\" $QT_END_LICENSE$ diff --git a/config.profiles/harmattan/manpages/qmake.1 b/config.profiles/harmattan/manpages/qmake.1 index 5a0b01246a..20f03e3e40 100644 --- a/config.profiles/harmattan/manpages/qmake.1 +++ b/config.profiles/harmattan/manpages/qmake.1 @@ -1,38 +1,38 @@ .TH QMAKE 1 "2005-07-23" .\" -.\" Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -.\" Contact: http://www.qt-project.org/ +.\" Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +.\" Contact: http://www.qt-project.org/legal .\" .\" This file is part of the QtGui module of the Qt Toolkit. .\" .\" $QT_BEGIN_LICENSE:LGPL$ +.\" Commercial License Usage +.\" Licensees holding valid commercial Qt licenses may use this file in +.\" accordance with the commercial license agreement provided with the +.\" Software or, alternatively, in accordance with the terms contained in +.\" a written agreement between you and Digia. For licensing terms and +.\" conditions see http://qt.digia.com/licensing. For further information +.\" use the contact form at http://qt.digia.com/contact-us. +.\" .\" GNU Lesser General Public License Usage -.\" 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. +.\" 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. .\" -.\" In addition, as a special exception, Nokia gives you certain additional -.\" rights. These rights are described in the Nokia Qt LGPL Exception +.\" In addition, as a special exception, Digia gives you certain additional +.\" rights. These rights are described in the Digia Qt LGPL Exception .\" version 1.1, included in the file LGPL_EXCEPTION.txt in this package. .\" .\" 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. -.\" -.\" -.\" -.\" +.\" 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. .\" .\" .\" $QT_END_LICENSE$ diff --git a/config.profiles/harmattan/manpages/qtconfig.1 b/config.profiles/harmattan/manpages/qtconfig.1 index 50e149ab1f..098c1d6840 100644 --- a/config.profiles/harmattan/manpages/qtconfig.1 +++ b/config.profiles/harmattan/manpages/qtconfig.1 @@ -1,38 +1,38 @@ .TH "qtconfig" "1" "3.0.3" "Nokia Corporation and/or its subsidiary(-ies)" "" .\" -.\" Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -.\" Contact: http://www.qt-project.org/ +.\" Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +.\" Contact: http://www.qt-project.org/legal .\" .\" This file is part of the QtGui module of the Qt Toolkit. .\" .\" $QT_BEGIN_LICENSE:LGPL$ +.\" Commercial License Usage +.\" Licensees holding valid commercial Qt licenses may use this file in +.\" accordance with the commercial license agreement provided with the +.\" Software or, alternatively, in accordance with the terms contained in +.\" a written agreement between you and Digia. For licensing terms and +.\" conditions see http://qt.digia.com/licensing. For further information +.\" use the contact form at http://qt.digia.com/contact-us. +.\" .\" GNU Lesser General Public License Usage -.\" 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. +.\" 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. .\" -.\" In addition, as a special exception, Nokia gives you certain additional -.\" rights. These rights are described in the Nokia Qt LGPL Exception +.\" In addition, as a special exception, Digia gives you certain additional +.\" rights. These rights are described in the Digia Qt LGPL Exception .\" version 1.1, included in the file LGPL_EXCEPTION.txt in this package. .\" .\" 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. -.\" -.\" -.\" -.\" +.\" 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. .\" .\" .\" $QT_END_LICENSE$ diff --git a/config.profiles/harmattan/manpages/uic.1 b/config.profiles/harmattan/manpages/uic.1 index 293a65ca54..3540c95e16 100644 --- a/config.profiles/harmattan/manpages/uic.1 +++ b/config.profiles/harmattan/manpages/uic.1 @@ -1,38 +1,38 @@ .TH uic 1 "2 Aug 2001" "Nokia Corporation and/or its subsidiary(-ies)" \" -*- nroff -*- .\" -.\" Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -.\" Contact: http://www.qt-project.org/ +.\" Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +.\" Contact: http://www.qt-project.org/legal .\" .\" This file is part of the QtGui module of the Qt Toolkit. .\" .\" $QT_BEGIN_LICENSE:LGPL$ +.\" Commercial License Usage +.\" Licensees holding valid commercial Qt licenses may use this file in +.\" accordance with the commercial license agreement provided with the +.\" Software or, alternatively, in accordance with the terms contained in +.\" a written agreement between you and Digia. For licensing terms and +.\" conditions see http://qt.digia.com/licensing. For further information +.\" use the contact form at http://qt.digia.com/contact-us. +.\" .\" GNU Lesser General Public License Usage -.\" 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. +.\" 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. .\" -.\" In addition, as a special exception, Nokia gives you certain additional -.\" rights. These rights are described in the Nokia Qt LGPL Exception +.\" In addition, as a special exception, Digia gives you certain additional +.\" rights. These rights are described in the Digia Qt LGPL Exception .\" version 1.1, included in the file LGPL_EXCEPTION.txt in this package. .\" .\" 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. -.\" -.\" -.\" -.\" +.\" 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. .\" .\" .\" $QT_END_LICENSE$ diff --git a/config.profiles/harmattan/mkspecs/linux-g++-cross/qplatformdefs.h b/config.profiles/harmattan/mkspecs/linux-g++-cross/qplatformdefs.h index ab4ff76aab..562128be17 100644 --- a/config.profiles/harmattan/mkspecs/linux-g++-cross/qplatformdefs.h +++ b/config.profiles/harmattan/mkspecs/linux-g++-cross/qplatformdefs.h @@ -1,38 +1,38 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the qmake spec of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** ** GNU Lesser General Public License Usage -** 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 +** 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. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** 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. -** -** -** -** +** 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. ** ** ** $QT_END_LICENSE$ diff --git a/config.profiles/harmattan/readdir-hppa-test.c b/config.profiles/harmattan/readdir-hppa-test.c index 26ae160add..80bb5123f9 100644 --- a/config.profiles/harmattan/readdir-hppa-test.c +++ b/config.profiles/harmattan/readdir-hppa-test.c @@ -1,38 +1,38 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal ** ** This file is part of the config.tests of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** ** GNU Lesser General Public License Usage -** 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. +** 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. ** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** 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. -** -** -** -** +** 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. ** ** ** $QT_END_LICENSE$ diff --git a/config.profiles/harmattan/tests/create_tests_xml b/config.profiles/harmattan/tests/create_tests_xml index a4dd7def93..16dd545a32 100644 --- a/config.profiles/harmattan/tests/create_tests_xml +++ b/config.profiles/harmattan/tests/create_tests_xml @@ -2,39 +2,39 @@ ############################################################################# ## -## Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -## Contact: http://www.qt-project.org/ +## Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +## Contact: http://www.qt-project.org/legal ## ## This file is the build configuration utility of the Qt Toolkit. ## ## $QT_BEGIN_LICENSE:LGPL$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and Digia. For licensing terms and +## conditions see http://qt.digia.com/licensing. For further information +## use the contact form at http://qt.digia.com/contact-us. +## ## GNU Lesser General Public License Usage -## 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. +## 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. ## -## In addition, as a special exception, Nokia gives you certain additional -## rights. These rights are described in the Nokia Qt LGPL Exception +## In addition, as a special exception, Digia gives you certain additional +## rights. These rights are described in the Digia Qt LGPL Exception ## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ## ## 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. -## -## -## -## +## 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. ## ## ## $QT_END_LICENSE$ diff --git a/config.profiles/harmattan/tests/maemo_tests.prf b/config.profiles/harmattan/tests/maemo_tests.prf index ce29cb5233..72975b8edb 100644 --- a/config.profiles/harmattan/tests/maemo_tests.prf +++ b/config.profiles/harmattan/tests/maemo_tests.prf @@ -1,38 +1,38 @@ ############################################################################# ## -## Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -## Contact: http://www.qt-project.org/ +## Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +## Contact: http://www.qt-project.org/legal ## ## This file is the build configuration utility of the Qt Toolkit. ## ## $QT_BEGIN_LICENSE:LGPL$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and Digia. For licensing terms and +## conditions see http://qt.digia.com/licensing. For further information +## use the contact form at http://qt.digia.com/contact-us. +## ## GNU Lesser General Public License Usage -## 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 +## 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. +## +## In addition, as a special exception, Digia gives you certain additional +## rights. These rights are described in the Digia Qt LGPL Exception ## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ## ## 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. -## -## -## -## +## 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. ## ## ## $QT_END_LICENSE$ diff --git a/config.profiles/symbian/bld.inf b/config.profiles/symbian/bld.inf index f11a23d74d..0407c52182 100644 --- a/config.profiles/symbian/bld.inf +++ b/config.profiles/symbian/bld.inf @@ -1,6 +1,6 @@ /* -* Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. +* Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +* Contact: http://www.qt-project.org/legal * * Description: Build information file for Qt configuration * diff --git a/config.profiles/symbian/headerexport b/config.profiles/symbian/headerexport index 25a6b6153b..2490515e92 100644 --- a/config.profiles/symbian/headerexport +++ b/config.profiles/symbian/headerexport @@ -3,8 +3,8 @@ # # Synchronizes Qt header files - internal development tool. # -# Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -# Contact: Nokia Corporation (qt-info@nokia.com) +# Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +# Contact: http://www.qt-project.org/legal # ###################################################################### diff --git a/config.profiles/symbian/qtconfig.flm b/config.profiles/symbian/qtconfig.flm index aa5e05ad68..3a712e07d0 100644 --- a/config.profiles/symbian/qtconfig.flm +++ b/config.profiles/symbian/qtconfig.flm @@ -1,6 +1,6 @@ # /**************************************************************************** # ** -# ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). +# ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). # ** Contact: # ** # ****************************************************************************/ |