diff options
| author | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2016-01-14 11:03:04 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2016-01-14 10:46:34 +0000 |
| commit | 4292fb7ef6d42255f6898637ca50b53720d1260e (patch) | |
| tree | 7622e4a6a267b0a15b62c4666776f4736885bb6f /plugins/qmlprofiler/flamegraphmodel.cpp | |
| parent | 4e29a946c786d3ca62215c473609f35ce2c35008 (diff) | |
Change license terms to commercial or GPL.
Change-Id: I928769fa86f1ac5c489918bf2da3c691054a0459
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
Diffstat (limited to 'plugins/qmlprofiler/flamegraphmodel.cpp')
| -rw-r--r-- | plugins/qmlprofiler/flamegraphmodel.cpp | 29 |
1 files changed, 12 insertions, 17 deletions
diff --git a/plugins/qmlprofiler/flamegraphmodel.cpp b/plugins/qmlprofiler/flamegraphmodel.cpp index b31ad74938..e181a66109 100644 --- a/plugins/qmlprofiler/flamegraphmodel.cpp +++ b/plugins/qmlprofiler/flamegraphmodel.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of Qt Creator. ** @@ -9,22 +9,17 @@ ** 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 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. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. ** -** 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 or version 3 as published by the Free -** Software Foundation and appearing in the file LICENSE.LGPLv21 and -** LICENSE.LGPLv3 included in the packaging of this file. Please review the -** following information to ensure the GNU Lesser General Public License -** 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, 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. +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 as published by the Free Software +** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ****************************************************************************/ |