summaryrefslogtreecommitdiffstats
path: root/src/network
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-12-1315-73/+146
|\
| * Doc: added spec about parameter enableNico Vertriest2016-12-121-2/+2
| * Add missing override into Qt modulesAlexander Volkov2016-12-013-11/+11
| * Tweak wording of QNetworkProxy doc for SOCKS5Edward Welbourne2016-11-291-1/+3
| * Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-11-251-1/+1
| |\
| | * Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-11-251-1/+1
| | |\
| | | * _q_networkSessionClosed - disconnect the correct objectTimur Pocheptsov2016-11-231-1/+1
| * | | Merge "Merge remote-tracking branch 'origin/5.7' into 5.8" into refs/staging/5.8Liang Qi2016-11-241-9/+7
| |\ \ \
| | * | | Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-11-241-9/+7
| | |\| |
| | | * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-11-231-6/+5
| | | |\|
| | | | * qnativesocketengine_winrt - do not shadow a variableTimur Pocheptsov2016-11-221-6/+5
| * | | | Don't set platform specific QT_NO_FOO defines in qglobal.hLars Knoll2016-11-241-0/+2
| |/ / /
| * | | Remove last traces of MeeGoLars Knoll2016-11-231-1/+1
| * | | winrt: Add support for Windows Information ProtectionMaurice Kalinowski2016-11-232-5/+76
| * | | Fix SCTP API according to Qt conventionsFriedemann Kleint2016-11-226-43/+43
* | | | qnativesocketengine_win.cpp: Fix comparison of OS versionFriedemann Kleint2016-12-091-10/+3
* | | | Add configurable connect timeout for QAbstractSocketSamuel Gaist2016-11-294-9/+69
* | | | qnativesocketengine_win.cpp: Use QOperatingSystemVersion to detect OSFriedemann Kleint2016-11-251-4/+7
* | | | qsslsocket_openssl_symbols.cpp: Fix signedness warning in DEFINEFUNC2Friedemann Kleint2016-11-241-1/+1
* | | | doc: clangqdoc must see SCTP classesMartin Smith2016-11-192-2/+2
* | | | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-11-172-2/+4
|\| | |
| * | | Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-11-161-1/+1
| |\| |
| | * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-11-152-4/+19
| | |\|
| | | * winrt: Proper guarding by readMutexOliver Wolff2016-11-082-4/+19
| * | | Unbreak a couple of configurationsLars Knoll2016-11-111-0/+2
| * | | Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-11-081-1/+1
| |\| |
| | * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-11-041-1/+1
| | |\|
| | | * winrt: Fixed assignment of readOrigin in readDatagramOliver Wolff2016-11-021-1/+1
* | | | Merge remote-tracking branch 'gerrit/5.8' into devTor Arne Vestbø2016-11-057-113/+98
|\| | |
| * | | configure -libproxy: add a warning if not namespacing QtEdward Welbourne2016-11-031-0/+13
| * | | winrt: Removed unused member variable from socket engineOliver Wolff2016-11-031-2/+0
| * | | winrt: Remove static mutex that protected handleReadyReadOliver Wolff2016-11-031-3/+0
| * | | winrt: Guard pendingReadOps with mutexOliver Wolff2016-11-032-0/+12
| * | | winrt: Proper guarding by readMutexOliver Wolff2016-11-032-6/+19
| * | | Add QNetworkProxy::usesSystemConfiguration() accessorKai Koehne2016-11-024-103/+55
* | | | QAbstractSocket: print error message before emitting the signalAlex Trotsenko2016-11-021-2/+2
* | | | QSocks5SocketEngine: improve buffering in CONNECT modeAlex Trotsenko2016-11-021-6/+5
* | | | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-11-0218-123/+523
|\| | |
| * | | Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-11-015-8/+17
| |\| |
| | * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-10-312-2/+6
| | |\|
| | | * QAbstractSocket: avoid unspecified behavior in writing on TCPAlex Trotsenko2016-10-272-2/+6
| | * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-10-222-6/+6
| | |\|
| | | * QNetworkReplyHttpImpl: Fix UB (member call) in destruction sequenceMarc Mutz2016-10-201-4/+2
| | | * winrt: Added timeout for cancellation of socket read operationOliver Wolff2016-10-201-2/+4
| | * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-10-171-0/+5
| | |\|
| | | * QNetworkSession: make sure that "interface" isn't #definedThiago Macieira2016-10-131-0/+5
| * | | Document Qt Network licensesKai Koehne2016-10-243-6/+69
| * | | HTTP/2 - fix the handling of PUSH_PROMISETimur Pocheptsov2016-10-217-99/+400
| * | | make setting OPENSSL_LIBS_{DEBUG,RELEASE} work with dynamic buildsOswald Buddenhagen2016-10-141-1/+8
| * | | Fix resolution of OPENSSL_LIBS in ssl.priKai Koehne2016-10-141-0/+2