diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2023-05-26 10:11:11 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2023-05-27 12:57:16 -0700 |
| commit | 26dd7fe4edb8ed39ebf12cae874eb89e46ff9067 (patch) | |
| tree | 9a193b161641f67e66986b483415c6e98662414e /src/network/kernel/qhostinfo_unix.cpp | |
| parent | 369952fbd7163c9ae2fa6401b8da3a5dc5d2368b (diff) | |
CMake: remove "res_ninit" feature and collapse to just "libresolv"
Testing for "res_ninit" when WrapResolv.cmake has already checked for
far more complex functions was pointless. Instead, just accept the
library that was found by find_package() as good enough and rename the
feature as "libresolv".
Amends 4a46ba1209907796f4a14f6feb35ed4d70155d7d and
68b625901f9eb7c34e3d7aa302e1c0a454d3190b.
Change-Id: Ib5ce7a497e034ebabb2cfffd1762c0afa2fac6e0
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'src/network/kernel/qhostinfo_unix.cpp')
| -rw-r--r-- | src/network/kernel/qhostinfo_unix.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/network/kernel/qhostinfo_unix.cpp b/src/network/kernel/qhostinfo_unix.cpp index 331c5fbf45..42194fb8b3 100644 --- a/src/network/kernel/qhostinfo_unix.cpp +++ b/src/network/kernel/qhostinfo_unix.cpp @@ -49,7 +49,7 @@ static void maybeRefreshResolver() return; #endif -#if QT_CONFIG(res_ninit) +#if QT_CONFIG(libresolv) // OSes known or thought to reach here: AIX, NetBSD, Solaris, // Linux with MUSL (though res_init() does nothing and is unnecessary) @@ -92,7 +92,7 @@ QHostInfo QHostInfoAgent::fromName(const QString &hostName) QString QHostInfo::localDomainName() { -#if QT_CONFIG(res_ninit) +#if QT_CONFIG(libresolv) auto domainNameFromRes = [](res_state r) { QString domainName; if (r->defdname[0]) @@ -111,7 +111,7 @@ QString QHostInfo::localDomainName() // using thread-unsafe version maybeRefreshResolver(); return domainNameFromRes(&_res); -#endif // !QT_CONFIG(res_ninit) +#endif // !QT_CONFIG(libresolv) // nothing worked, try doing it by ourselves: QFile resolvconf; |