summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets/code/src_network_kernel_qhostinfo.cpp
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2009-08-13 04:37:41 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2009-08-13 04:37:41 (GMT)
commitefe66141d535d1741f302efff9248db726cd66b1 (patch)
treea495722170c03ab9ee27b9cdc347c13a9d9e61f3 /doc/src/snippets/code/src_network_kernel_qhostinfo.cpp
parent89a2087b7ec5e36f7f4dd16d942aa23d2c7a6042 (diff)
parent07d2ce1e6df9f2b5b9c3263741f9a8f160cdbc80 (diff)
downloadQt-efe66141d535d1741f302efff9248db726cd66b1.zip
Qt-efe66141d535d1741f302efff9248db726cd66b1.tar.gz
Qt-efe66141d535d1741f302efff9248db726cd66b1.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Conflicts: configure configure.exe mkspecs/features/qt.prf src/corelib/global/qglobal.h src/corelib/kernel/qobject_p.h
Diffstat (limited to 'doc/src/snippets/code/src_network_kernel_qhostinfo.cpp')
-rw-r--r--doc/src/snippets/code/src_network_kernel_qhostinfo.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/src/snippets/code/src_network_kernel_qhostinfo.cpp b/doc/src/snippets/code/src_network_kernel_qhostinfo.cpp
index e748f90..b96a777 100644
--- a/doc/src/snippets/code/src_network_kernel_qhostinfo.cpp
+++ b/doc/src/snippets/code/src_network_kernel_qhostinfo.cpp
@@ -1,6 +1,6 @@
//! [0]
-// To find the IP address of qtsoftware.com
-QHostInfo::lookupHost("qtsoftware.com",
+// To find the IP address of qt.nokia.com
+QHostInfo::lookupHost("qt.nokia.com",
this, SLOT(printResults(QHostInfo)));
// To find the host name for 4.2.2.1
@@ -10,7 +10,7 @@ QHostInfo::lookupHost("4.2.2.1",
//! [1]
-QHostInfo info = QHostInfo::fromName("qtsoftware.com");
+QHostInfo info = QHostInfo::fromName("qt.nokia.com");
//! [1]