diff options
| author | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2009-08-17 11:50:47 (GMT) |
|---|---|---|
| committer | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2009-08-17 11:50:47 (GMT) |
| commit | 17d6f2a59fe2b170087cdf7074807c6a2dce1043 (patch) | |
| tree | 64af0faa3146cd516b9887c9344ebd03408bafcc /src/xml/sax/qxml.cpp | |
| parent | 103334ced3b0cb6e69a1ed3075d9b81e591f37e9 (diff) | |
| parent | 3d50220423b96a84f1ca4c0f5ef9246345aad359 (diff) | |
| download | Qt-17d6f2a59fe2b170087cdf7074807c6a2dce1043.zip Qt-17d6f2a59fe2b170087cdf7074807c6a2dce1043.tar.gz Qt-17d6f2a59fe2b170087cdf7074807c6a2dce1043.tar.bz2 | |
Merge commit 'qt/master' into kinetic-graphicseffect
Diffstat (limited to 'src/xml/sax/qxml.cpp')
| -rw-r--r-- | src/xml/sax/qxml.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/xml/sax/qxml.cpp b/src/xml/sax/qxml.cpp index 3b1726b..0f17231 100644 --- a/src/xml/sax/qxml.cpp +++ b/src/xml/sax/qxml.cpp @@ -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 http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -3149,7 +3149,7 @@ bool QXmlSimpleReader::feature(const QString& name, bool *ok) const { const QXmlSimpleReaderPrivate *d = d_func(); - // Qt5 ###: Change these strings to qtsoftware.com + // Qt5 ###: Change these strings to qt.nokia.com if (ok != 0) *ok = true; if (name == QLatin1String("http://xml.org/sax/features/namespaces")) { @@ -3204,7 +3204,7 @@ bool QXmlSimpleReader::feature(const QString& name, bool *ok) const void QXmlSimpleReader::setFeature(const QString& name, bool enable) { Q_D(QXmlSimpleReader); - // Qt5 ###: Change these strings to qtsoftware.com + // Qt5 ###: Change these strings to qt.nokia.com if (name == QLatin1String("http://xml.org/sax/features/namespaces")) { d->useNamespaces = enable; } else if (name == QLatin1String("http://xml.org/sax/features/namespace-prefixes")) { @@ -3222,7 +3222,7 @@ void QXmlSimpleReader::setFeature(const QString& name, bool enable) */ bool QXmlSimpleReader::hasFeature(const QString& name) const { - // Qt5 ###: Change these strings to qtsoftware.com + // Qt5 ###: Change these strings to qt.nokia.com if (name == QLatin1String("http://xml.org/sax/features/namespaces") || name == QLatin1String("http://xml.org/sax/features/namespace-prefixes") || name == QLatin1String("http://trolltech.com/xml/features/report-whitespace-only-CharData") // Shouldn't change in Qt 4 |