diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-27 02:09:39 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-27 02:09:39 (GMT) |
| commit | 53e77aace976b5c908ea71f15146ccb575fb1cc5 (patch) | |
| tree | c4836665d94e9156c6a502cef1e2a63d288fe025 /src/network | |
| parent | 59c58576efd3ceff7add46a359fd99e56a2fb279 (diff) | |
| parent | 15866a4436814da5da9348a8c930ee1d826ecb9a (diff) | |
| download | Qt-53e77aace976b5c908ea71f15146ccb575fb1cc5.zip Qt-53e77aace976b5c908ea71f15146ccb575fb1cc5.tar.gz Qt-53e77aace976b5c908ea71f15146ccb575fb1cc5.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (31 commits)
Make symbian/unix shadow builds work again.
Change the files to camelcase as avkon now does that
Update EABI and WINSCW DEF files for Symbian
Fix linking on arm with def files
Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to 4b88f595ab62b7c5f703a286c4f5f13f8784a936
Fixed incorrect parsing of TARGET.EPOCHEAPSIZE.
Fixed make runonphone that looked for the package in the wrong place.
Fixed several problems with the postlinker for Symbian (elf2e32).
Don't crash when cleaning the uninitialized fontdatabase (Symbian)
Revert "Fixing the race condition in event dispatcher implementation on"
Revert "Fixing race condition in qeventdispatcher_symbian.cpp code path"
Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to a80fd59e3b3b18116803a14e6369345933994236
Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to a80fd59e3b3b18116803a14e6369345933994236
Fixed memory restrictions not being passed on to elf2e32.
Allow TLW translucency on Symbian without Qt::FramelessWindowHint
Updated UIDs for spectrum demo
Ensure that compiling with the no debug/warning output defines works
Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to f0dcb906fe56b5dc06aa305b6cfc821d5dd25a28
Clean up HB_Anchor's DeviceTables on failure when loading format 3
Make sure ValueRecord's DeviceTables are cleaned up on failure
...
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/kernel/qhostinfo_unix.cpp | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/network/kernel/qhostinfo_unix.cpp b/src/network/kernel/qhostinfo_unix.cpp index 90751f4..3112dd6 100644 --- a/src/network/kernel/qhostinfo_unix.cpp +++ b/src/network/kernel/qhostinfo_unix.cpp @@ -210,12 +210,23 @@ QHostInfo QHostInfoAgent::fromName(const QString &hostName) #ifdef Q_ADDRCONFIG hints.ai_flags = Q_ADDRCONFIG; #endif +#ifdef Q_OS_SYMBIAN +# ifdef QHOSTINFO_DEBUG + qDebug() << "Setting flags: 'hints.ai_flags &= AI_V4MAPPED | AI_ALL'"; +# endif +#endif int result = getaddrinfo(aceHostname.constData(), 0, &hints, &res); # ifdef Q_ADDRCONFIG if (result == EAI_BADFLAGS) { // if the lookup failed with AI_ADDRCONFIG set, try again without it hints.ai_flags = 0; +#ifdef Q_OS_SYMBIAN +# ifdef QHOSTINFO_DEBUG + qDebug() << "Setting flags: 'hints.ai_flags &= AI_V4MAPPED | AI_ALL'"; +# endif + hints.ai_flags &= AI_V4MAPPED | AI_ALL; +#endif result = getaddrinfo(aceHostname.constData(), 0, &hints, &res); } # endif @@ -224,6 +235,9 @@ QHostInfo QHostInfoAgent::fromName(const QString &hostName) addrinfo *node = res; QList<QHostAddress> addresses; while (node) { +#ifdef QHOSTINFO_DEBUG + qDebug() << "getaddrinfo node: flags:" << node->ai_flags << "family:" << node->ai_family << "ai_socktype:" << node->ai_socktype << "ai_protocol:" << node->ai_protocol << "ai_addrlen:" << node->ai_addrlen; +#endif if (node->ai_family == AF_INET) { QHostAddress addr; addr.setAddress(ntohl(((sockaddr_in *) node->ai_addr)->sin_addr.s_addr)); |