summaryrefslogtreecommitdiffstats
path: root/src/xml/sax
diff options
context:
space:
mode:
authorVolker Hilsheimer <volker.hilsheimer@nokia.com>2009-06-16 15:15:48 (GMT)
committerVolker Hilsheimer <volker.hilsheimer@nokia.com>2009-06-16 15:15:48 (GMT)
commite73e36a16bb51fa66bdccc780f177e2c4d5d8092 (patch)
tree12b6de8d0cb5c630a05f28686d4baabe474dbfda /src/xml/sax
parent237a3e690f290fd8ef8ef2a51459caa7fdc7bef1 (diff)
parentd4ea3957a535ac522bd29b0645e614e0ccd09f82 (diff)
downloadQt-e73e36a16bb51fa66bdccc780f177e2c4d5d8092.zip
Qt-e73e36a16bb51fa66bdccc780f177e2c4d5d8092.tar.gz
Qt-e73e36a16bb51fa66bdccc780f177e2c4d5d8092.tar.bz2
Merge license header changes from 4.5
Diffstat (limited to 'src/xml/sax')
-rw-r--r--src/xml/sax/qxml.cpp4
-rw-r--r--src/xml/sax/qxml.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/xml/sax/qxml.cpp b/src/xml/sax/qxml.cpp
index db50f01..d776cc4 100644
--- a/src/xml/sax/qxml.cpp
+++ b/src/xml/sax/qxml.cpp
@@ -1,7 +1,7 @@
/****************************************************************************
**
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
**
** This file is part of the QtXml module of the Qt Toolkit.
**
@@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** contact the sales department at http://www.qtsoftware.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/src/xml/sax/qxml.h b/src/xml/sax/qxml.h
index e0165d3..8aa7e63 100644
--- a/src/xml/sax/qxml.h
+++ b/src/xml/sax/qxml.h
@@ -1,7 +1,7 @@
/****************************************************************************
**
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
**
** This file is part of the QtXml module of the Qt Toolkit.
**
@@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** contact the sales department at http://www.qtsoftware.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/