summaryrefslogtreecommitdiff
path: root/src/xmlpatterns/expr/qtriplecontainer_p.h
diff options
context:
space:
mode:
authorAntti Kokko <antti.kokko@digia.com>2014-08-21 13:42:19 +0300
committerJani Heikkinen <jani.heikkinen@digia.com>2014-08-24 17:28:54 +0200
commite60c4466df48d6536fef0c77dc1df1c9d05e97d4 (patch)
tree6ca3dcb5fdd87a36f83ef68f39514536d670f115 /src/xmlpatterns/expr/qtriplecontainer_p.h
parentd1b17740ed4d9b1e3c3ad5898bb8259969dc77df (diff)
downloadqtxmlpatterns-e60c4466df48d6536fef0c77dc1df1c9d05e97d4.tar.gz
Update license headers and add new license files
- Renamed LICENSE.LGPL to LICENSE.LGPLv21 - Added LICENSE.LGPLv3 & LICENSE.GPLv2 - Removed LICENSE.GPL Change-Id: If9208b9c90bcea35bbfe6b9c10db7803e97767e0 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
Diffstat (limited to 'src/xmlpatterns/expr/qtriplecontainer_p.h')
-rw-r--r--src/xmlpatterns/expr/qtriplecontainer_p.h30
1 files changed, 11 insertions, 19 deletions
diff --git a/src/xmlpatterns/expr/qtriplecontainer_p.h b/src/xmlpatterns/expr/qtriplecontainer_p.h
index 811215b..9764cee 100644
--- a/src/xmlpatterns/expr/qtriplecontainer_p.h
+++ b/src/xmlpatterns/expr/qtriplecontainer_p.h
@@ -1,40 +1,32 @@
/****************************************************************************
**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the QtXmlPatterns 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$
**
****************************************************************************/