summaryrefslogtreecommitdiffstats
path: root/src/network/socket
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/dev' into wip/cmakeAlexandru Croitor2020-01-291-1/+1
|\
| * Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-01-281-1/+1
| |\
| | * Doc/QtBase: replace some 0 with \nullptrChristian Ehrlicher2020-01-261-1/+1
* | | Merge remote-tracking branch 'origin/dev' into merge-devLeander Beernaert2020-01-2415-111/+168
|\| |
| * | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-01-161-14/+7
| |\|
| | * QHostInfo: Remove useless codeMårten Nordheim2020-01-151-14/+7
| * | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-01-139-31/+94
| |\|
| | * QLocalSocket - deprecate ambiguous 'error' overloadsTimur Pocheptsov2020-01-105-6/+46
| | * QAbstractSocket: deprecate 'error' member-functionTimur Pocheptsov2020-01-105-25/+48
| * | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-12-0911-47/+47
| |\|
| | * Tidy nullptr usageAllan Sandfeld Jensen2019-12-0611-47/+47
| * | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-11-254-20/+21
| |\|
| | * Avoid initializing QFlags with 0 or nullptr in further casesFriedemann Kleint2019-11-221-1/+0
| | * Deprecate constructing QFlags from a pointerAllan Sandfeld Jensen2019-11-201-2/+2
| | * Make QObjectPrivate::threadData a proper atomicGiuseppe D'Angelo2019-11-132-7/+7
| | * Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-082-10/+12
| | |\
| | | * Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-11-062-10/+12
| | | |\
| | | | * Clarify Q{Abstract,Local}Socket::waitForDisconnected() documentationKari Oikarinen2019-11-012-10/+12
* | | | | Fix build of tests in static buildsAlexandru Croitor2019-11-271-0/+2
* | | | | Merge remote-tracking branch 'origin/dev' into wip/cmakeLeander Beernaert2019-11-192-22/+25
|\| | | |
| * | | | Ensure we don't move the Listener struct aroundLars Knoll2019-10-302-22/+25
| |/ / /
* | | | Merge remote-tracking branch 'origin/dev' into wip/cmakeAlexandru Croitor2019-10-141-6/+9
|\| | |
| * | | Win: QUdpSocket: Use QVarLengthArray for retrieving sizeMårten Nordheim2019-10-111-6/+9
| |/ /
* | | Merge branch 'wip/qt6' into wip/cmakeAlexandru Croitor2019-08-153-61/+59
|\| |
| * | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-07-191-1/+1
| |\|
| | * Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-07-181-1/+1
| | |\
| | | * QHttpSocketEngine: The 'Connection' options are case insensitiveMårten Nordheim2019-07-151-1/+1
| * | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-07-171-60/+55
| |\| |
| | * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-07-121-60/+55
| | |\|
| | | * Windows: handle errors correctly when connecting to unreachable hostVolker Hilsheimer2019-07-111-60/+55
| * | | QNativeSocketEngine: disable sign-compare warning-turned-error on ClangMarc Mutz2019-07-131-0/+3
* | | | Merge remote-tracking branch 'origin/wip/qt6' into wip/cmakeAlexandru Croitor2019-07-112-21/+28
|\| | |
| * | | QtNetwork: port remaining uses of QMutex::Recursive to QRecursiveMutexMarc Mutz2019-07-061-4/+2
| * | | Merge remote-tracking branch 'origin/5.13' into devLiang Qi2019-07-052-12/+19
| |\| |
| | * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-07-032-12/+19
| | |\|
| | | * Fix compiler warnings when building with DEBUG defines setVolker Hilsheimer2019-07-021-12/+12
| | | * QSocks5SocketEngine: account for in-transit signal when waiting for readMårten Nordheim2019-07-021-0/+5
| | | * QSocks5SocketEngine: pass data to application when connectedMårten Nordheim2019-07-021-0/+2
| * | | Merge remote-tracking branch 'origin/5.13' into devLiang Qi2019-07-011-2/+4
| |\| |
| | * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-06-291-2/+4
| | |\|
| | | * QSocks5SocketEngine: avoid dereferencing null-pointerMårten Nordheim2019-06-281-2/+4
| * | | QSocks5SocketEnginePrivate::sendRequestMethod(): Fix out of bounds string accessFriedemann Kleint2019-06-281-3/+3
* | | | Merge remote-tracking branch 'origin/dev' into wip/cmakeAlexandru Croitor2019-06-035-8/+13
|\| | |
| * | | QtNetwork: port away from Java-style iteratorsMarc Mutz2019-05-211-4/+3
| * | | Merge remote-tracking branch 'origin/5.13' into devLiang Qi2019-05-133-3/+9
| |\| |
| | * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-05-091-1/+7
| | |\|
| | | * WinRT: Fix crash in native socket engine during closeMårten Nordheim2019-05-081-1/+7
| | * | Doc: replace even more null/0/nullptr with \nullptr macroChristian Ehrlicher2019-05-082-2/+2
| * | | Migrate Windows system libs to external dependenciesJoerg Bornemann2019-05-081-1/+1
* | | | Merge commit 'dev' into 'wip/cmake-merge'Tobias Hunger2019-04-1619-105/+113
|\| | |