diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-22 19:59:08 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-22 19:59:08 +0100 |
| commit | 2a1292b9168d40e71c9e67a41d3b8c499b8e222b (patch) | |
| tree | 071014337919d63a62718ea6979fd48775ad61df /src/network/ssl | |
| parent | 2be7746e0922fa404da567fd0bc0cbc00c6215cb (diff) | |
| parent | c204f6e417fe9b10df29e0ba00c7a94e0aa52cef (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I4b56ce8c76729d9fc60995564299f8f27336fcde
Diffstat (limited to 'src/network/ssl')
| -rw-r--r-- | src/network/ssl/qssldiffiehellmanparameters.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/ssl/qssldiffiehellmanparameters.cpp b/src/network/ssl/qssldiffiehellmanparameters.cpp index 7fbcff2861..65041d4456 100644 --- a/src/network/ssl/qssldiffiehellmanparameters.cpp +++ b/src/network/ssl/qssldiffiehellmanparameters.cpp @@ -136,7 +136,7 @@ QSslDiffieHellmanParameters QSslDiffieHellmanParameters::fromEncoded(const QByte to check whether the Diffie-Hellman parameters were valid and loaded correctly. - In particular, if \a device is \c nullptr or not open for reading, an invalid + In particular, if \a device is \nullptr or not open for reading, an invalid object will be returned. \sa isValid() |