summaryrefslogtreecommitdiffstats
path: root/src/network
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-01-152-3/+27
|\
| * Uncomment erroneously commented 'error'Timur Pocheptsov2020-01-142-3/+1
| * QNetworkReply: deprecate the 'error' getterTimur Pocheptsov2020-01-132-3/+29
* | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-01-1316-46/+133
|\ \ | |/
| * QSslSocket: deprecate sslErrors() getterTimur Pocheptsov2020-01-102-4/+28
| * QLocalSocket - deprecate ambiguous 'error' overloadsTimur Pocheptsov2020-01-105-6/+46
| * QAbstractSocket: deprecate 'error' member-functionTimur Pocheptsov2020-01-1011-36/+59
* | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-01-102-4/+10
|\ \ | |/
| * Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-092-4/+10
| |\
| | * Use prefixed ssl libs when "-openssl-linked" configure params is usedBogDan Vatra2020-01-072-4/+10
* | | Merge remote-tracking branch 'origin/5.15' into devFriedemann Kleint2020-01-071-1/+1
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-061-1/+1
| |\ \ | | |/
| | * Fix some qdoc warningsFriedemann Kleint2020-01-021-1/+1
* | | Merge remote-tracking branch 'origin/5.15' into devLiang Qi2020-01-042-3/+3
|\ \ \ | |/ /
| * | Fix some qdoc warningsFriedemann Kleint2020-01-031-1/+1
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Liang Qi2019-12-161-1/+1
| |\ \ | | |/
| | * Doc: Fix qdoc compilation errors qtbaseNico Vertriest2019-12-121-1/+1
| * | Replace usages of QVariant::value by qvariant_castOlivier Goffart2019-12-151-1/+1
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-12-0946-190/+1494
|\ \ \ | |/ /
| * | Tidy nullptr usageAllan Sandfeld Jensen2019-12-0645-194/+194
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-12-041-8/+4
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Ulf Hermann2019-12-031-8/+4
| |\ \ | | |/
| | * QSslSocket (OpenSSL) fix a resource leakTimur Pocheptsov2019-11-271-8/+4
* | | QSslSocket (OpenSSL) improve alert messages handlingTimur Pocheptsov2019-12-0311-22/+558
* | | QSsl - delete all mentions of SslV2 and SslV3Timur Pocheptsov2019-11-288-144/+54
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-11-2520-42/+54
|\ \ \ | |/ /
| * | Avoid initializing QFlags with 0 or nullptr in further casesFriedemann Kleint2019-11-223-3/+2
| * | Make transferTimeout getters constVille Voutilainen2019-11-224-4/+4
| * | Deprecate TlsV1SslV3Timur Pocheptsov2019-11-221-1/+3
| * | Deprecate constructing QFlags from a pointerAllan Sandfeld Jensen2019-11-204-9/+9
| * | Port QThread::wait() to QDeadlineTimerChristian Ehrlicher2019-11-133-3/+3
| * | Make QObjectPrivate::threadData a proper atomicGiuseppe D'Angelo2019-11-132-7/+7
| * | Deprecate enumerators fro SSL v.2 and v.3 protocolsTimur Pocheptsov2019-11-131-2/+4
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-085-14/+20
| |\ \ | | |/
| | * Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-11-065-14/+20
| | |\
| | | * Clarify Q{Abstract,Local}Socket::waitForDisconnected() documentationKari Oikarinen2019-11-014-13/+18
| | | * Schannel: no longer keep old ssl errors around when reusing socketMårten Nordheim2019-10-071-1/+2
| * | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-052-4/+7
| |\ \ \ | | |/ /
| | * | QNetworkReply: Fix SSL configuration handlingFriedemann Kleint2019-11-012-4/+7
* | | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-11-0220-2557/+913
|\ \ \ \ | |/ / /
| * | | QSslSocket - remove old OpenSSL backend (< 1.1)Timur Pocheptsov2019-11-0120-2557/+913
* | | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-11-013-0/+45
|\ \ \ \ | |/ / /
| * | | Add a transfer timeout at QNAM level as wellVille Voutilainen2019-10-313-0/+45
* | | | Ensure we don't move the Listener struct aroundLars Knoll2019-10-302-22/+25
* | | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-10-305-8/+98
|\ \ \ \ | |/ / /
| * | | Add a timeout for transfersVille Voutilainen2019-10-284-3/+96
| * | | Network proxy (macOS) - fix a memory leakTimur Pocheptsov2019-10-271-5/+2
* | | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-10-262-41/+91
|\ \ \ \ | |/ / /
| * | | Use Schannel's incomplete data guesstimation featureMårten Nordheim2019-10-212-0/+33
| * | | Schannel refactoringMårten Nordheim2019-10-211-44/+61