Lars Knoll db92f2f3aa Merge remote-tracking branch 'origin/5.9' into 5.10 ... Conflicts: .qmake.conf mkspecs/win32-g++/qmake.conf src/corelib/global/qglobal_p.h src/corelib/global/qoperatingsystemversion_p.h src/corelib/io/qfilesystemengine_win.cpp src/network/bearer/qbearerengine.cpp src/platformsupport/input/libinput/qlibinputpointer.cpp src/sql/doc/snippets/code/doc_src_sql-driver.cpp src/widgets/kernel/qwidget_p.h src/widgets/kernel/qwidgetwindow.cpp src/widgets/styles/qfusionstyle.cpp tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp Change-Id: I80e2722f481b12fff5d967c28f89208c0e9a1dd8		2017-12-30 12:09:53 +01:00
..
platformsocketengine	QNativeSocketEngine: disable unused methods about OS socket buffer	2017-09-01 16:40:36 +00:00
qabstractsocket	Updated license headers	2016-01-21 18:55:18 +00:00
qhttpsocketengine	Use qtConfig throughout in qtbase	2016-08-19 04:28:05 +00:00
qlocalsocket	Add QLocalServer::socketDescriptor	2017-06-06 17:46:50 +00:00
qsctpsocket	Network: Use canonical license headers	2017-02-28 15:34:01 +00:00
qsocks5socketengine	tst_QSocks5SocketEngine::downloadBigFile(): Output elapsed time	2017-06-28 17:54:07 +00:00
qtcpserver	Convert features.socks5 to QT_[REQUIRE_]CONFIG	2017-09-06 06:50:54 +00:00
qtcpsocket	Merge remote-tracking branch 'origin/5.9' into 5.10	2017-11-28 11:23:35 +01:00
qudpsocket	Merge remote-tracking branch 'origin/5.9' into 5.10	2017-12-30 12:09:53 +01:00
socket.pro	Modularize configure.json/.pri	2016-09-15 08:23:53 +00:00