summaryrefslogtreecommitdiffstats
path: root/src/corelib/doc/snippets/code/src_corelib_io_qurl.cpp
diff options
context:
space:
mode:
authorSergio Ahumada <sergio.ahumada@digia.com>2013-01-31 18:55:53 +0100
committerSergio Ahumada <sergio.ahumada@digia.com>2013-01-31 18:55:53 +0100
commit6239af6f0f15871e02a516c97c5f1775743d352b (patch)
tree904e3e5df8c6f3e4aa820db4f2d9e73e3026dfd4 /src/corelib/doc/snippets/code/src_corelib_io_qurl.cpp
parent3dc47622a469ded1c99397fdedc2053b73d57189 (diff)
parent6654a05fcad565a302e205e7f7deaa0b2757082d (diff)
Merge branch 'release' into stable
Diffstat (limited to 'src/corelib/doc/snippets/code/src_corelib_io_qurl.cpp')
-rw-r--r--src/corelib/doc/snippets/code/src_corelib_io_qurl.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/doc/snippets/code/src_corelib_io_qurl.cpp b/src/corelib/doc/snippets/code/src_corelib_io_qurl.cpp
index ad2e502be8..532a0e1f59 100644
--- a/src/corelib/doc/snippets/code/src_corelib_io_qurl.cpp
+++ b/src/corelib/doc/snippets/code/src_corelib_io_qurl.cpp
@@ -45,7 +45,7 @@ QUrl url("http://www.example.com/List of holidays.xml");
//! [1]
-QUrl url = QUrl::fromEncoded("http://qt.nokia.com/List%20of%20holidays.xml");
+QUrl url = QUrl::fromEncoded("http://qt-project.org/List%20of%20holidays.xml");
//! [1]
@@ -73,10 +73,10 @@ http://www.example.com/cgi-bin/drawgraph.cgi?type(pie)color(green)
//! [5]
-QUrl baseUrl("http://qt.nokia.com/support");
-QUrl relativeUrl("../products/solutions");
+QUrl baseUrl("http://qt.digia.com/Support/");
+QUrl relativeUrl("../Product/Library/");
qDebug(baseUrl.resolved(relativeUrl).toString());
-// prints "http://qt.nokia.com/products/solutions"
+// prints "http://qt.digia.com/Product/Library/"
//! [5]