aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/corelib/tools/generateoptions.h
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@theqtcompany.com>2015-03-02 16:05:17 +0100
committerJoerg Bornemann <joerg.bornemann@theqtcompany.com>2015-03-02 17:48:55 +0000
commitb9bfe43a069c42b7845c411c6b13004fb1fe6d34 (patch)
tree44810a4c84eaa778ce3f0d5d0bdf6ff99fce715b /src/lib/corelib/tools/generateoptions.h
parent2b955c8342315413fe4d2621612b5ab96f6d43ff (diff)
update license headers
Change-Id: I36d825db3a5ef32c162c3063aab1e8a1f2696f4f Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Diffstat (limited to 'src/lib/corelib/tools/generateoptions.h')
-rw-r--r--src/lib/corelib/tools/generateoptions.h23
1 files changed, 12 insertions, 11 deletions
diff --git a/src/lib/corelib/tools/generateoptions.h b/src/lib/corelib/tools/generateoptions.h
index edb736c06..06d08ba75 100644
--- a/src/lib/corelib/tools/generateoptions.h
+++ b/src/lib/corelib/tools/generateoptions.h
@@ -2,7 +2,7 @@
**
** Copyright (C) 2015 The Qt Company Ltd.
** Copyright (C) 2015 Jake Petroules.
-** Contact: http://www.qt-project.org/legal
+** Contact: http://www.qt.io/licensing
**
** This file is part of the Qt Build Suite.
**
@@ -10,20 +10,21 @@
** 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.
+** 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
** 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.
+** 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, 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.
**
****************************************************************************/