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
..
access	Merge remote-tracking branch 'origin/5.10' into dev	2018-01-02 09:58:44 +01:00
bearer	Merge remote-tracking branch 'origin/5.8' into 5.9	2017-03-13 15:55:44 +01:00
kernel	Merge remote-tracking branch 'origin/5.10' into dev	2017-11-30 09:16:58 +01:00
socket	Merge remote-tracking branch 'origin/5.10' into dev	2018-01-02 09:58:44 +01:00
ssl	Merge "Merge remote-tracking branch 'origin/5.10' into dev" into refs/staging/dev	2017-11-30 12:57:22 +00:00
network.pro	Re-enable network tests on Mac OS.	2012-04-24 16:06:28 +02:00