diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-08-17 13:58:48 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-08-17 13:58:48 (GMT) |
| commit | ff6f17c92ad1bfa898bc89a5ccb65361d443c591 (patch) | |
| tree | f0ac9ead3755b886975dada5c977e969600526fd /src/network/kernel/qhostinfo.cpp | |
| parent | cd1b5d933575fb801ad3014f3d7fd7c268a362d1 (diff) | |
| parent | 1970e2d46656db8178636e06c82287f536b626c7 (diff) | |
| download | Qt-ff6f17c92ad1bfa898bc89a5ccb65361d443c591.zip Qt-ff6f17c92ad1bfa898bc89a5ccb65361d443c591.tar.gz Qt-ff6f17c92ad1bfa898bc89a5ccb65361d443c591.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'src/network/kernel/qhostinfo.cpp')
| -rw-r--r-- | src/network/kernel/qhostinfo.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/kernel/qhostinfo.cpp b/src/network/kernel/qhostinfo.cpp index 8ae1305..348b0d2 100644 --- a/src/network/kernel/qhostinfo.cpp +++ b/src/network/kernel/qhostinfo.cpp @@ -647,7 +647,7 @@ void QHostInfoLookupManager::lookupFinished(QHostInfoRunnable *r) work(); } -// This function returns immediatly when we had a result in the cache, else it will later emit a signal +// This function returns immediately when we had a result in the cache, else it will later emit a signal QHostInfo qt_qhostinfo_lookup(const QString &name, QObject *receiver, const char *member, bool *valid, int *id) { *valid = false; |