diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-08-28 17:50:31 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-08-28 17:50:31 +0200 |
commit | c60e5eab7103796f3059a64959843ea2c0a821c0 (patch) | |
tree | fe9cceeb670130bc404fa7caba65d3c2378b26af /src/x11extras/qtx11extrasglobal.h | |
parent | c58b4a5076f7a7f9404cbdb25a3c20476d998ad6 (diff) | |
parent | ad22f63229345aca8d8ab0eba5dba17cbb6614f1 (diff) | |
download | qtx11extras-c60e5eab7103796f3059a64959843ea2c0a821c0.tar.gz |
Merge remote-tracking branch 'origin/5.4' into dev
Change-Id: Ibf8b681e5501561add1a02ba99b82056a4d4b102
Diffstat (limited to 'src/x11extras/qtx11extrasglobal.h')
-rw-r--r-- | src/x11extras/qtx11extrasglobal.h | 28 |
1 files changed, 10 insertions, 18 deletions
diff --git a/src/x11extras/qtx11extrasglobal.h b/src/x11extras/qtx11extrasglobal.h index ce59c21..c30f1bb 100644 --- a/src/x11extras/qtx11extrasglobal.h +++ b/src/x11extras/qtx11extrasglobal.h @@ -5,36 +5,28 @@ ** ** This file is part of the QtCore module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL$ +** $QT_BEGIN_LICENSE:LGPL21$ ** 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 +** 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 -** 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 +** rights. These rights are described in the Digia Qt 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.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$ ** ****************************************************************************/ |