diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-01-28 19:30:32 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2019-01-28 19:30:32 +0000 |
| commit | e3621dd6bd32a64e602ae87711c24d6aae2989b5 (patch) | |
| tree | c4539c9aa6b1a4b9a4e88ef5caef4bd3e29c7b41 /src/network | |
| parent | 71cd5a6f3643a5369b883d0e36478693de6db024 (diff) | |
| parent | 980567b3a32b2e2f00c86f2d627cd82b5230dd0f (diff) | |
Merge "Merge remote-tracking branch 'origin/5.12' into dev" into refs/staging/dev
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/kernel/qnetworkinterface_unix.cpp | 2 | ||||
| -rw-r--r-- | src/network/ssl/qpassworddigestor.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/network/kernel/qnetworkinterface_unix.cpp b/src/network/kernel/qnetworkinterface_unix.cpp index 8f290e5107..c28c5ea9e6 100644 --- a/src/network/kernel/qnetworkinterface_unix.cpp +++ b/src/network/kernel/qnetworkinterface_unix.cpp @@ -464,8 +464,10 @@ static QNetworkInterface::InterfaceType probeIfType(int socket, int iftype, stru case IFM_ETHER: return QNetworkInterface::Ethernet; +#ifdef IFM_FDDI case IFM_FDDI: return QNetworkInterface::Fddi; +#endif case IFM_IEEE80211: return QNetworkInterface::Ieee80211; diff --git a/src/network/ssl/qpassworddigestor.cpp b/src/network/ssl/qpassworddigestor.cpp index 127d94e849..706fa1de05 100644 --- a/src/network/ssl/qpassworddigestor.cpp +++ b/src/network/ssl/qpassworddigestor.cpp @@ -75,7 +75,7 @@ namespace QPasswordDigestor { \a salt must always be 8 bytes long! \note This function is provided for use with legacy applications and all - new applications are recommended to use \l {pbkdf2} {PBKDF2}. + new applications are recommended to use \l {deriveKeyPbkdf2} {PBKDF2}. \sa deriveKeyPbkdf2, QCryptographicHash, QCryptographicHash::hashLength */ |