diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-02-22 09:19:56 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-02-22 09:19:56 +0100 |
| commit | 9f33b84b0937a53e8e31e0c1e34506eecef6f2e4 (patch) | |
| tree | 91e9bac96d61c08babd5b6415f276d44888e79dd /src/network | |
| parent | 4cbc7f798017d76e018dc3f04968703624b6a6cf (diff) | |
| parent | b97765efd452921f75c1d04820c4b5e9e9d49100 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Iec636692e8b7d1fe1bc0476e49c5054a5892d639
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/access/qnetworkaccessfilebackend.cpp | 1 | ||||
| -rw-r--r-- | src/network/ssl/qsslconfiguration.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/network/access/qnetworkaccessfilebackend.cpp b/src/network/access/qnetworkaccessfilebackend.cpp index a5e7daff11..d4ca9c22fc 100644 --- a/src/network/access/qnetworkaccessfilebackend.cpp +++ b/src/network/access/qnetworkaccessfilebackend.cpp @@ -46,6 +46,7 @@ #include "private/qnoncontiguousbytedevice_p.h" #include <QtCore/QCoreApplication> +#include <QtCore/QDateTime> QT_BEGIN_NAMESPACE diff --git a/src/network/ssl/qsslconfiguration.cpp b/src/network/ssl/qsslconfiguration.cpp index cbbbac85fe..e0c705f97e 100644 --- a/src/network/ssl/qsslconfiguration.cpp +++ b/src/network/ssl/qsslconfiguration.cpp @@ -889,7 +889,7 @@ QMap<QByteArray, QVariant> QSslConfiguration::backendConfig() const /*! \since 5.11 - Sets an option in the backend-specific configuration. + Sets the option \a name in the backend-specific configuration to \a value. Options supported by the OpenSSL (>= 1.0.2) backend are available in the \l {https://www.openssl.org/docs/manmaster/man3/SSL_CONF_cmd.html#SUPPORTED-CONFIGURATION-FILE-COMMANDS} |