summaryrefslogtreecommitdiffstats
path: root/src/corelib/xml/qxmlstream.g
diff options
context:
space:
mode:
Diffstat (limited to 'src/corelib/xml/qxmlstream.g')
-rw-r--r--src/corelib/xml/qxmlstream.g48
1 files changed, 24 insertions, 24 deletions
diff --git a/src/corelib/xml/qxmlstream.g b/src/corelib/xml/qxmlstream.g
index a1d1e84b51..7e1b679df3 100644
--- a/src/corelib/xml/qxmlstream.g
+++ b/src/corelib/xml/qxmlstream.g
@@ -1,38 +1,38 @@
----------------------------------------------------------------------------
--
--- Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
--- Contact: http://www.qt-project.org/
+-- Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+-- Contact: http://www.qt-project.org/legal
--
-- This file is part of the QtCore module of the Qt Toolkit.
--
-- $QT_BEGIN_LICENSE:LGPL$
+-- 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
+-- use the contact form at http://qt.digia.com/contact-us.
+--
-- GNU Lesser General Public License Usage
--- 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.
+-- 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.
--
--- In addition, as a special exception, Nokia gives you certain additional
--- rights. These rights are described in the Nokia Qt LGPL Exception
+-- In addition, as a special exception, Digia gives you certain additional
+-- 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.
---
--- Other Usage
--- Alternatively, this file may be used in accordance with the terms and
--- conditions contained in a signed written agreement between you and Nokia.
---
---
---
---
+-- 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$