diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-08-14 06:29:13 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-08-14 06:29:13 (GMT) |
| commit | 0c831b8cf84c72ee8673d1d38f4e93e350dddd5f (patch) | |
| tree | 84fc3c89d73342ec70d77b2bdf99066f987536b8 /src/corelib/io/qurl.cpp | |
| parent | b98b7d305ffebb700e471bd64a7dee59d947e056 (diff) | |
| parent | 4b1b93f3f97de70af316052bc38048f52631b9e4 (diff) | |
| download | Qt-0c831b8cf84c72ee8673d1d38f4e93e350dddd5f.zip Qt-0c831b8cf84c72ee8673d1d38f4e93e350dddd5f.tar.gz Qt-0c831b8cf84c72ee8673d1d38f4e93e350dddd5f.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/corelib/io/qurl.cpp')
| -rw-r--r-- | src/corelib/io/qurl.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp index 2841bac..423f5e2 100644 --- a/src/corelib/io/qurl.cpp +++ b/src/corelib/io/qurl.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$ ** ****************************************************************************/ @@ -5680,7 +5680,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) @@ -5697,7 +5697,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) @@ -5989,10 +5989,10 @@ bool QUrl::isParentOf(const QUrl &childUrl) const Use resolved("..") instead. \oldcode - QUrl url("http://qtsoftware.com/Developer/"); + QUrl url("http://example.com/Developer/"); url.cdUp(); \newcode - QUrl url("http://qtsoftware.com/Developer/"); + QUrl url("http://example.com/Developer/"); url = url.resolved(".."); \endcode */ |