path: root/src/network/kernel
diff options
authorLiang Qi <>2016-08-13 01:05:02 +0200
committerLiang Qi <>2016-08-13 01:05:02 +0200
commit6b8f422c5e56b95aad298e1b984fb60fba1da282 (patch)
tree545dac994ef985cc91d92fa77da21581b6762c86 /src/network/kernel
parentd04982dc84d66bec92b4b3767538676cf925ef17 (diff)
parentd9e66f63a95b24ce3a7d2a30ccaf4dcab85d55a0 (diff)
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts: src/corelib/global/qglobal.cpp src/corelib/io/qsettings.cpp src/corelib/itemmodels/qstringlistmodel.cpp tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp Change-Id: I1c6c306ef42c3c0234b19907914b19da706b4a03
Diffstat (limited to 'src/network/kernel')
2 files changed, 3 insertions, 3 deletions
diff --git a/src/network/kernel/qnetworkinterface.cpp b/src/network/kernel/qnetworkinterface.cpp
index c64d8e13cd..28893aa71c 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 ad78c48fd8..645f74c616 100644
--- a/src/network/kernel/qnetworkproxy.cpp
+++ b/src/network/kernel/qnetworkproxy.cpp
@@ -1528,7 +1528,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
@@ -1547,7 +1547,7 @@ void QNetworkProxyFactory::setApplicationProxyFactory(QNetworkProxyFactory *fact
listed here.
- \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