summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorSergio Ahumada <sergio.ahumada@digia.com>2012-11-15 15:53:08 +0100
committerLars Knoll <lars.knoll@digia.com>2012-11-28 09:20:31 +0100
commit7853af34ec991a1ff2d0b23f09439d34663e47b1 (patch)
tree01071b15f9788c6df0233e5196f3d5186b1389a5 /configure
parent3302d258f94ff5b197bc9fb7f17a6ce1220f33a0 (diff)
Change copyrights from Nokia to Digia4.5
Change copyrights and license headers from Nokia to Digia Change-Id: I9f5c8a9135271161e2bce50bc413ea01a08c3a76 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure38
1 files changed, 19 insertions, 19 deletions
diff --git a/configure b/configure
index ea84d18d1a..56b9b7b1e4 100755
--- a/configure
+++ b/configure
@@ -1,18 +1,19 @@
#!/bin/sh
#############################################################################
##
-## Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-## All rights reserved.
-## Contact: Nokia Corporation (qt-info@nokia.com)
+## 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$
-## 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.
+## 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
## Alternatively, this file may be used under the terms of the GNU Lesser
@@ -22,18 +23,17 @@
## 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.
##
-## 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.
##
##
## $QT_END_LICENSE$
@@ -3737,7 +3737,7 @@ echo
if [ "$Edition" = "NokiaInternalBuild" ]; then
echo "Detected -nokia-developer option"
echo "Nokia employees and agents are allowed to use this software under"
- echo "the authority of Nokia Corporation and/or its subsidiary(-ies)"
+ echo "the authority of Digia Plc and/or its subsidiary(-ies)"
elif [ "$Edition" = "OpenSource" ]; then
while true; do
echo "You are licensed to use this software under the terms of"