diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-27 01:00:44 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-27 01:00:45 +0100 |
| commit | c6fc2bc3e205e3710d1f9bdca984c3309cc2eb06 (patch) | |
| tree | 98dff745ee072895b1d3171ef439a9533689a517 /src/network/bearer/qnetworkconfiguration.cpp | |
| parent | ac7f46dd9114051756f56571b9cb3bda002314a1 (diff) | |
| parent | bc107d81004a5f3929f30088f4a58a221bea5c3b (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I14eaabe98845445a9ea5266872cc1797786cfe04
Diffstat (limited to 'src/network/bearer/qnetworkconfiguration.cpp')
| -rw-r--r-- | src/network/bearer/qnetworkconfiguration.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/bearer/qnetworkconfiguration.cpp b/src/network/bearer/qnetworkconfiguration.cpp index e36903fc94..f5ced0693a 100644 --- a/src/network/bearer/qnetworkconfiguration.cpp +++ b/src/network/bearer/qnetworkconfiguration.cpp @@ -518,7 +518,7 @@ QNetworkConfiguration::BearerType QNetworkConfiguration::bearerTypeFamily() cons /*! Returns the type of bearer used by this network configuration as a string. - The string is not translated and therefore can not be shown to the user. The subsequent table + The string is not translated and therefore cannot be shown to the user. The subsequent table shows the fixed mappings between BearerType and the bearer type name for known types. If the BearerType is unknown this function may return additional information if it is available; otherwise an empty string will be returned. |