diff options
Diffstat (limited to 'src/network/kernel')
| -rw-r--r-- | src/network/kernel/qnetworkinterface.cpp | 2 | ||||
| -rw-r--r-- | src/network/kernel/qnetworkproxy.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/network/kernel/qnetworkinterface.cpp b/src/network/kernel/qnetworkinterface.cpp index 22d2e6bb70..c5d1adbef0 100644 --- a/src/network/kernel/qnetworkinterface.cpp +++ b/src/network/kernel/qnetworkinterface.cpp @@ -365,7 +365,7 @@ void QNetworkAddressEntry::setBroadcast(const QHostAddress &newBroadcast) Not all operating systems support reporting all features. Only the IPv4 addresses are guaranteed to be listed by this class in all platforms. In particular, IPv6 address listing is only supported - on Windows, Linux, OS X and the BSDs. + on Windows, Linux, \macos and the BSDs. \sa QNetworkAddressEntry */ diff --git a/src/network/kernel/qnetworkproxy.cpp b/src/network/kernel/qnetworkproxy.cpp index 2f7e9d537d..bb1a7d0d8b 100644 --- a/src/network/kernel/qnetworkproxy.cpp +++ b/src/network/kernel/qnetworkproxy.cpp @@ -1557,7 +1557,7 @@ void QNetworkProxyFactory::setApplicationProxyFactory(QNetworkProxyFactory *fact those settings are not found, this function will attempt to obtain Internet Explorer's settings and use them. - On MacOS X, this function will obtain the proxy settings using the + On \macos, this function will obtain the proxy settings using the SystemConfiguration framework from Apple. It will apply the FTP, HTTP and HTTPS proxy configurations for queries that contain the protocol tag "ftp", "http" and "https", respectively. If the SOCKS @@ -1576,7 +1576,7 @@ void QNetworkProxyFactory::setApplicationProxyFactory(QNetworkProxyFactory *fact listed here. \list - \li On MacOS X, this function will ignore the Proxy Auto Configuration + \li On \macos, this function will ignore the Proxy Auto Configuration settings, since it cannot execute the associated ECMAScript code. \li On Windows platforms, this function may take several seconds to |