summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2009-08-11 07:40:03 (GMT)
committerJason McDonald <jason.mcdonald@nokia.com>2009-08-11 07:40:03 (GMT)
commita958ab9c98481100870a87ee07b8e0abddbfc804 (patch)
treee8d5c8f4e5b6b33942af6fac748e7fa9feef8d9c /src/corelib
parent411991d0e6a04085d9f8379ceccce337c5b6e818 (diff)
downloadQt-a958ab9c98481100870a87ee07b8e0abddbfc804.zip
Qt-a958ab9c98481100870a87ee07b8e0abddbfc804.tar.gz
Qt-a958ab9c98481100870a87ee07b8e0abddbfc804.tar.bz2
Qt's domain name is now qt.nokia.com.
Reviewed-by: Trust Me
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/io/qurl.cpp8
-rw-r--r--src/corelib/xml/qxmlstream.h2
2 files changed, 5 insertions, 5 deletions
diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp
index a912167..1aae420 100644
--- a/src/corelib/io/qurl.cpp
+++ b/src/corelib/io/qurl.cpp
@@ -5523,7 +5523,7 @@ QString QUrl::fromPunycode(const QByteArray &pc)
The ASCII Compatible Encoding (ACE) is defined by RFC 3490, RFC 3491
and RFC 3492. It is part of the Internationalizing Domain Names in
Applications (IDNA) specification, which allows for domain names
- (like \c "qtsoftware.com") to be written using international
+ (like \c "example.com") to be written using international
characters.
*/
QString QUrl::fromAce(const QByteArray &domain)
@@ -5540,7 +5540,7 @@ QString QUrl::fromAce(const QByteArray &domain)
The ASCII-Compatible Encoding (ACE) is defined by RFC 3490, RFC 3491
and RFC 3492. It is part of the Internationalizing Domain Names in
Applications (IDNA) specification, which allows for domain names
- (like \c "qtsoftware.com") to be written using international
+ (like \c "example.com") to be written using international
characters.
*/
QByteArray QUrl::toAce(const QString &domain)
@@ -5850,10 +5850,10 @@ bool QUrl::isParentOf(const QUrl &childUrl) const
Use resolved("..") instead.
\oldcode
- QUrl url("http://qtsoftware.com/Developer/");
+ QUrl url("http://qt.nokia.com/Developer/");
url.cdUp();
\newcode
- QUrl url("http://qtsoftware.com/Developer/");
+ QUrl url("http://qt.nokia.com/Developer/");
url = url.resolved("..");
\endcode
*/
diff --git a/src/corelib/xml/qxmlstream.h b/src/corelib/xml/qxmlstream.h
index 9c1b6d2..228b147 100644
--- a/src/corelib/xml/qxmlstream.h
+++ b/src/corelib/xml/qxmlstream.h
@@ -60,7 +60,7 @@ QT_MODULE(Core)
// keep binary compatibility
//
// The list of supported platforms is in:
-// http://qtsoftware.com/developer/notes/supported_platforms
+// http://qt.nokia.com/developer/notes/supported_platforms
//
// These platforms do not support symbol moving nor duplication
// (because duplicate symbols cause warnings when linking):