diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-17 00:40:07 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-17 00:40:07 (GMT) |
| commit | 5e38a334b1ef46a932c8aff65a7d448b5c7df853 (patch) | |
| tree | efd294d5c727f432c5d0ffd3e3cbadc7d90f398e /src/corelib/xml/qxmlstream.g | |
| parent | fd5acfc663383c38e4d0993a4163023d46137e32 (diff) | |
| parent | 22aaef6c81897f96e9954b5aaae1816d143b456f (diff) | |
| download | Qt-5e38a334b1ef46a932c8aff65a7d448b5c7df853.zip Qt-5e38a334b1ef46a932c8aff65a7d448b5c7df853.tar.gz Qt-5e38a334b1ef46a932c8aff65a7d448b5c7df853.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Updating file with CRLF line endings for the updated header
Fix a regression in QList::mid()
update gitignore
remove -fno-stack-protector
Fix make confclean
Update licenseheader text in source files
Diffstat (limited to 'src/corelib/xml/qxmlstream.g')
| -rw-r--r-- | src/corelib/xml/qxmlstream.g | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/corelib/xml/qxmlstream.g b/src/corelib/xml/qxmlstream.g index 3088632..26e7323 100644 --- a/src/corelib/xml/qxmlstream.g +++ b/src/corelib/xml/qxmlstream.g @@ -7,29 +7,29 @@ -- This file is part of the QtCore module of the Qt Toolkit. -- -- $QT_BEGIN_LICENSE:LGPL$ --- No Commercial Usage --- This file contains pre-release code and may not be distributed. --- You may use this file in accordance with the terms and conditions --- contained in the Technology Preview License Agreement accompanying --- this package. --- -- 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. +-- 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 +-- rights. These rights are described in the Nokia Qt LGPL Exception -- version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -- --- If you have questions regarding the use of this file, please contact --- Nokia at qt-info@nokia.com. --- --- +-- 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. -- -- -- |