OSDN Git Service

apply upstream commits
authorIvailo Monev <xakepa10@laimg.moc>
Mon, 24 Jun 2019 03:16:29 +0000 (03:16 +0000)
committerIvailo Monev <xakepa10@laimg.moc>
Mon, 24 Jun 2019 03:16:29 +0000 (03:16 +0000)
commit32cd31acd3e7c925f52a054a68339a5e03ee4118
tree05f9bfb74eafb23b965800553b4ff5a4c4c7798f
parent9289a463a8fc5a21409aa1adbcf5f58a13313056
apply upstream commits

this includes the following upstream commits:
https://github.com/qt/qtbase/commit/8566487286439e65f217c0e80733d40ea9b19ac8
https://github.com/qt/qtbase/commit/57ca755d2efbdb7268e8014cb4c50c9ea1c65bfc
https://github.com/qt/qtbase/commit/ef4ba0285f9c5dd5ee2dca1e0cefee45eba3477c

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
README
src/core/io/qfile.cpp
src/core/io/qprocess.cpp
src/core/tools/qringbuffer_p.h
src/network/socket/qabstractsocket.cpp
src/network/ssl/qsslsocket.cpp
src/network/ssl/qsslsocket_openssl.cpp