diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-12-04 19:41:52 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2018-12-04 19:41:52 +0000 |
| commit | 009a5538ebce4c5517a717a201707f2b79749f64 (patch) | |
| tree | 9dfd3f3d3b6ab997eeb37215e948b5af7160beb8 /src/network | |
| parent | e19df161cdc14f834a278fe0939d50475864a78c (diff) | |
| parent | 5d5c00c67682bce105197b659687fd1fee8f60cf (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/bearer/qnetworkconfiguration.cpp | 2 | ||||
| -rw-r--r-- | src/network/configure.json | 1 | ||||
| -rw-r--r-- | src/network/configure.pri | 6 | ||||
| -rw-r--r-- | src/network/ssl/qsslcontext_openssl11.cpp | 10 |
4 files changed, 8 insertions, 11 deletions
diff --git a/src/network/bearer/qnetworkconfiguration.cpp b/src/network/bearer/qnetworkconfiguration.cpp index 3367de80c8..e36903fc94 100644 --- a/src/network/bearer/qnetworkconfiguration.cpp +++ b/src/network/bearer/qnetworkconfiguration.cpp @@ -347,6 +347,8 @@ int QNetworkConfiguration::connectTimeout() const This allows control of the timeout used by \c QAbstractSocket to establish a connection. + \note \a timeout is in millisecond. + \warning This will have no effect if the bearer plugin doesn't have the CanStartAndStopInterfaces capability. diff --git a/src/network/configure.json b/src/network/configure.json index 368209cd3f..31f8bf9533 100644 --- a/src/network/configure.json +++ b/src/network/configure.json @@ -33,7 +33,6 @@ ] }, "network": { - "export": "", "sources": [ { "type": "makeSpec", "spec": "NETWORK" } ] diff --git a/src/network/configure.pri b/src/network/configure.pri index fa502db1d1..ad4d711cba 100644 --- a/src/network/configure.pri +++ b/src/network/configure.pri @@ -1,10 +1,10 @@ # custom tests defineTest(qtConfLibrary_openssl) { - libs = $$getenv("OPENSSL_LIBS") + eval(libs = $$getenv("OPENSSL_LIBS")) !isEmpty(libs) { - eval($${1}.libs = $$libs) - export($${1}.libs) + !qtConfResolveLibs($${1}.libs, $$libs): \ + return(false) return(true) } qtLog("$OPENSSL_LIBS is not set.") diff --git a/src/network/ssl/qsslcontext_openssl11.cpp b/src/network/ssl/qsslcontext_openssl11.cpp index 02ce466c80..c96a48dac1 100644 --- a/src/network/ssl/qsslcontext_openssl11.cpp +++ b/src/network/ssl/qsslcontext_openssl11.cpp @@ -97,24 +97,20 @@ init_context: unsupportedProtocol = true; } else { switch (sslContext->sslConfiguration.protocol()) { -#if QT_CONFIG(dtls) case QSsl::DtlsV1_0: case QSsl::DtlsV1_0OrLater: case QSsl::DtlsV1_2: case QSsl::DtlsV1_2OrLater: +#if QT_CONFIG(dtls) isDtls = true; sslContext->ctx = q_SSL_CTX_new(client ? q_DTLS_client_method() : q_DTLS_server_method()); - break; #else // dtls - case QSsl::DtlsV1_0: - case QSsl::DtlsV1_0OrLater: - case QSsl::DtlsV1_2: - case QSsl::DtlsV1_2OrLater: sslContext->ctx = nullptr; unsupportedProtocol = true; qCWarning(lcSsl, "DTLS protocol requested, but feature 'dtls' is disabled"); - break; + #endif // dtls + break; case QSsl::TlsV1_3: case QSsl::TlsV1_3OrLater: #if !defined(TLS1_3_VERSION) |