Update License

Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>

8 files changed, 35 insertions, 25 deletions

diff --git a/dist/appdata.xml b/dist/appdata.xml
index 85c275b384..017bbf9445 100644
--- a/dist/appdata.xml
+++ b/dist/appdata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 Digia Plc and/or its subsidiary(-ies) Contact: http://www.qt-project.org/legal -->
+<!-- Copyright (C) 2015 The Qt Company Ltd. Contact: http://www.qt.io/licensing -->
 <application>
  <id type="desktop">qtcreator.desktop</id>
  <licence>CC-BY-SA</licence>
diff --git a/dist/copyright_template.txt b/dist/copyright_template.txt
index fed3da5b8b..82930ac023 100644
--- a/dist/copyright_template.txt
+++ b/dist/copyright_template.txt
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing
 **
 ** This file is part of Qt Creator.
 **
@@ -9,8 +9,8 @@
 ** 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://www.qt.io/licensing.  For further information
+** a written agreement between you and The Qt Company.  For licensing terms and
+** conditions see http://www.qt.io/terms-conditions.  For further information
 ** use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
@@ -22,8 +22,8 @@
 ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
 ** 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
+** In addition, as a special exception, The Qt Company gives you certain additional
+** rights.  These rights are described in The Qt Company LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ****************************************************************************/
diff --git a/dist/installer/ifw/config/config-linux.xml.in b/dist/installer/ifw/config/config-linux.xml.in
index 1958a6cfbd..ecc965eec0 100644
--- a/dist/installer/ifw/config/config-linux.xml.in
+++ b/dist/installer/ifw/config/config-linux.xml.in
@@ -4,7 +4,7 @@
     <Version>{version}</Version>
     <Title>Qt Creator {version}</Title>
     <Publisher>Qt Project</Publisher>
-    <ProductUrl>http://qt-project.org</ProductUrl>
+    <ProductUrl>http://www.qt.io</ProductUrl>
 
     <InstallerWindowIcon>logo.png</InstallerWindowIcon>
     <Watermark>watermark.png</Watermark>
diff --git a/dist/installer/ifw/config/config-mac.xml.in b/dist/installer/ifw/config/config-mac.xml.in
index 24abb21ef0..72bdd23ded 100644
--- a/dist/installer/ifw/config/config-mac.xml.in
+++ b/dist/installer/ifw/config/config-mac.xml.in
@@ -4,7 +4,7 @@
     <Version>{version}</Version>
     <Title>Qt Creator {version}</Title>
     <Publisher>Qt Project</Publisher>
-    <ProductUrl>http://qt-project.org</ProductUrl>
+    <ProductUrl>http://www.qt.io</ProductUrl>
 
     <InstallerWindowIcon>logo.png</InstallerWindowIcon>
     <Background>background.png</Background>
diff --git a/dist/installer/ifw/config/config-windows.xml.in b/dist/installer/ifw/config/config-windows.xml.in
index b9b163d37f..fce2db2a02 100644
--- a/dist/installer/ifw/config/config-windows.xml.in
+++ b/dist/installer/ifw/config/config-windows.xml.in
@@ -4,7 +4,7 @@
     <Version>{version}</Version>
     <Title>Qt Creator {version}</Title>
     <Publisher>Qt Project</Publisher>
-    <ProductUrl>http://qt-project.org</ProductUrl>
+    <ProductUrl>http://www.qt.io</ProductUrl>
 
     <InstallerWindowIcon>logo.png</InstallerWindowIcon>
     <Watermark>watermark.png</Watermark>
diff --git a/dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/LICENSE.LGPLv21 b/dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/LICENSE.LGPLv21
index 84f5523315..607a694a7a 100644
--- a/dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/LICENSE.LGPLv21
+++ b/dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/LICENSE.LGPLv21
@@ -1,5 +1,15 @@
-		  GNU LESSER GENERAL PUBLIC LICENSE
-		       Version 2.1, February 1999
+                   GNU LESSER GENERAL PUBLIC LICENSE
+
+Qt Creator is Copyright (C) 2015 The Qt Company Ltd.
+Contact: http://www.qt.io/licensing
+
+You may use, distribute and copy Qt Creator under the terms of
+GNU Lesser General Public License version 2.1, which is displayed below.
+
+-------------------------------------------------------------------------
+
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 2.1, February 1999
 
  Copyright (C) 1991, 1999 Free Software Foundation, Inc.
  51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
@@ -10,7 +20,7 @@
  as the successor of the GNU Library Public License, version 2, hence
  the version number 2.1.]
 
-			    Preamble
+                            Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -112,7 +122,7 @@ modification follow.  Pay close attention to the difference between a
 former contains code derived from the library, whereas the latter must
 be combined with the library in order to run.
 
-		  GNU LESSER GENERAL PUBLIC LICENSE
+                  GNU LESSER GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License Agreement applies to any software library or other
@@ -432,7 +442,7 @@ decision will be guided by the two goals of preserving the free status
 of all derivatives of our free software and of promoting the sharing
 and reuse of software generally.
 
-			    NO WARRANTY
+                            NO WARRANTY
 
   15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
 WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
@@ -455,7 +465,7 @@ FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
 SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
 DAMAGES.
 
-		     END OF TERMS AND CONDITIONS
+                     END OF TERMS AND CONDITIONS
 
            How to Apply These Terms to Your New Libraries
 
diff --git a/dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/LICENSE.LGPLv3 b/dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/LICENSE.LGPLv3
index aed671a0c9..aa09558d50 100644
--- a/dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/LICENSE.LGPLv3
+++ b/dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/LICENSE.LGPLv3
@@ -1,9 +1,9 @@
             GNU LESSER GENERAL PUBLIC LICENSE
 
- The Qt Toolkit is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
- Contact: http://www.qt-project.org/legal
+ Qt Creator is Copyright (C) 2015 The Qt Company Ltd.
+ Contact: http://www.qt.io/licensing
 
- You may use, distribute and copy the Qt GUI Toolkit under the terms of
+ You may use, distribute and copy Qt Creator under the terms of
  GNU Lesser General Public License version 3, which is displayed below.
 
 -------------------------------------------------------------------------
diff --git a/dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/installscript.qs b/dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/installscript.qs
index b544ad23f8..5561359007 100644
--- a/dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/installscript.qs
+++ b/dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/installscript.qs
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing
 **
 ** This file is part of the Qt SDK.
 **
@@ -9,8 +9,8 @@
 ** 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://www.qt.io/licensing.  For further information
+** a written agreement between you and The Qt Company.  For licensing terms and
+** conditions see http://www.qt.io/terms-conditions.  For further information
 ** use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
@@ -22,8 +22,8 @@
 ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
 ** 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
+** In addition, as a special exception, The Qt Company gives you certain additional
+** rights.  These rights are described in The Qt Company LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ****************************************************************************/