diff options
author | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-01-15 10:34:57 +0100 |
---|---|---|
committer | Joerg Bornemann <joerg.bornemann@theqtcompany.com> | 2015-01-26 12:31:29 +0100 |
commit | 8dc50118a0ece90a997aaa93cd834dbd75f90639 (patch) | |
tree | a29d0bcceac4dadff34af6bbd1ef4391c27c75db /examples/cocoa-touch-application | |
parent | ff18f6944becdfb77f3294af80d5b7e9f8688fef (diff) | |
download | qbs-8dc50118a0ece90a997aaa93cd834dbd75f90639.tar.gz |
Update License
Change-Id: I092fca9f950de1ba38826c33b155f86feae2770b
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Diffstat (limited to 'examples/cocoa-touch-application')
9 files changed, 52 insertions, 52 deletions
diff --git a/examples/cocoa-touch-application/CocoaTouchApplication.qbs b/examples/cocoa-touch-application/CocoaTouchApplication.qbs index 4ae8b29d2..89a20dc3e 100644 --- a/examples/cocoa-touch-application/CocoaTouchApplication.qbs +++ b/examples/cocoa-touch-application/CocoaTouchApplication.qbs @@ -1,8 +1,8 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Copyright (C) 2014 Petroules Corporation. -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2015 Petroules Corporation. +** Contact: http://www.qt.io/licensing ** ** This file is part of the examples of the Qt Build Suite. ** @@ -17,7 +17,7 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** * Neither the name of The Qt Company Ltd and its Subsidiary(-ies) nor the names ** of its contributors may be used to endorse or promote products derived ** from this software without specific prior written permission. ** diff --git a/examples/cocoa-touch-application/CocoaTouchApplication/AppDelegate.h b/examples/cocoa-touch-application/CocoaTouchApplication/AppDelegate.h index 176a64c08..05c78e7d1 100644 --- a/examples/cocoa-touch-application/CocoaTouchApplication/AppDelegate.h +++ b/examples/cocoa-touch-application/CocoaTouchApplication/AppDelegate.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Petroules Corporation. -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 Petroules Corporation. +** Contact: http://www.qt.io/licensing ** ** This file is part of the Qt Build Suite. ** @@ -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/examples/cocoa-touch-application/CocoaTouchApplication/AppDelegate.m b/examples/cocoa-touch-application/CocoaTouchApplication/AppDelegate.m index abcb61a53..35f6ec7f3 100644 --- a/examples/cocoa-touch-application/CocoaTouchApplication/AppDelegate.m +++ b/examples/cocoa-touch-application/CocoaTouchApplication/AppDelegate.m @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Petroules Corporation. -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 Petroules Corporation. +** Contact: http://www.qt.io/licensing ** ** This file is part of the Qt Build Suite. ** @@ -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/examples/cocoa-touch-application/CocoaTouchApplication/CocoaTouchApplication-Prefix.pch b/examples/cocoa-touch-application/CocoaTouchApplication/CocoaTouchApplication-Prefix.pch index 35d69d5b9..a9b185069 100644 --- a/examples/cocoa-touch-application/CocoaTouchApplication/CocoaTouchApplication-Prefix.pch +++ b/examples/cocoa-touch-application/CocoaTouchApplication/CocoaTouchApplication-Prefix.pch @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Petroules Corporation. -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 Petroules Corporation. +** Contact: http://www.qt.io/licensing ** ** This file is part of the Qt Build Suite. ** @@ -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/examples/cocoa-touch-application/CocoaTouchApplication/DetailViewController.h b/examples/cocoa-touch-application/CocoaTouchApplication/DetailViewController.h index 70e2973c4..584729e7f 100644 --- a/examples/cocoa-touch-application/CocoaTouchApplication/DetailViewController.h +++ b/examples/cocoa-touch-application/CocoaTouchApplication/DetailViewController.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Petroules Corporation. -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 Petroules Corporation. +** Contact: http://www.qt.io/licensing ** ** This file is part of the Qt Build Suite. ** @@ -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/examples/cocoa-touch-application/CocoaTouchApplication/DetailViewController.m b/examples/cocoa-touch-application/CocoaTouchApplication/DetailViewController.m index a0bd58396..8d72aea2e 100644 --- a/examples/cocoa-touch-application/CocoaTouchApplication/DetailViewController.m +++ b/examples/cocoa-touch-application/CocoaTouchApplication/DetailViewController.m @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Petroules Corporation. -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 Petroules Corporation. +** Contact: http://www.qt.io/licensing ** ** This file is part of the Qt Build Suite. ** @@ -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/examples/cocoa-touch-application/CocoaTouchApplication/MasterViewController.h b/examples/cocoa-touch-application/CocoaTouchApplication/MasterViewController.h index 219ea5e1e..41d7a7211 100644 --- a/examples/cocoa-touch-application/CocoaTouchApplication/MasterViewController.h +++ b/examples/cocoa-touch-application/CocoaTouchApplication/MasterViewController.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Petroules Corporation. -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 Petroules Corporation. +** Contact: http://www.qt.io/licensing ** ** This file is part of the Qt Build Suite. ** @@ -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/examples/cocoa-touch-application/CocoaTouchApplication/MasterViewController.m b/examples/cocoa-touch-application/CocoaTouchApplication/MasterViewController.m index 677fbbb1a..6d2b3b68a 100644 --- a/examples/cocoa-touch-application/CocoaTouchApplication/MasterViewController.m +++ b/examples/cocoa-touch-application/CocoaTouchApplication/MasterViewController.m @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Petroules Corporation. -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 Petroules Corporation. +** Contact: http://www.qt.io/licensing ** ** This file is part of the Qt Build Suite. ** @@ -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/examples/cocoa-touch-application/CocoaTouchApplication/main.m b/examples/cocoa-touch-application/CocoaTouchApplication/main.m index 1074c3d9e..a8512ef0e 100644 --- a/examples/cocoa-touch-application/CocoaTouchApplication/main.m +++ b/examples/cocoa-touch-application/CocoaTouchApplication/main.m @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Petroules Corporation. -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 Petroules Corporation. +** Contact: http://www.qt.io/licensing ** ** This file is part of the Qt Build Suite. ** @@ -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. ** ****************************************************************************/ |