Lars Knoll 0f315adf91 Merge remote-tracking branch 'origin/5.10' into dev ... Conflicts: .qmake.conf sc/corelib/io/qfsfileengine_p.h src/corelib/io/qstorageinfo_unix.cpp src/platformsupport/eglconvenience/qeglpbuffer_p.h src/platformsupport/input/libinput/qlibinputkeyboard.cpp src/platformsupport/input/libinput/qlibinputpointer.cpp src/plugins/platforms/cocoa/qcocoamenu.mm src/plugins/platforms/ios/qiosscreen.h src/plugins/platforms/ios/qioswindow.h src/plugins/platforms/ios/quiview.mm src/printsupport/dialogs/qpagesetupdialog_unix_p.h src/printsupport/dialogs/qprintpreviewdialog.cpp src/printsupport/widgets/qcupsjobwidget_p.h src/widgets/widgets/qmenu.cpp tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp Change-Id: Iecb4883122efe97ef0ed850271e6c51bab568e9c		2018-01-02 09:58:44 +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	Replace Q_DECL_OVERRIDE with override where possible	2017-09-19 11:53:42 +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.10' into dev	2017-11-30 09:16:58 +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