Qt Forward Merge Bot 053e7cce79 Merge remote-tracking branch 'origin/5.11' into dev ... Conflicts: .qmake.conf src/corelib/doc/src/objectmodel/signalsandslots.qdoc src/plugins/platforms/cocoa/qcocoamenuloader.mm src/plugins/platforms/xcb/qxcbconnection.cpp src/plugins/platforms/xcb/qxcbconnection.h src/plugins/platforms/xcb/qxcbconnection_xi2.cpp src/plugins/platforms/xcb/qxcbwindow.cpp tests/auto/gui/image/qimage/tst_qimage.cpp Done-with: Gatis Paeglis <gatis.paeglis@qt.io> Change-Id: I9bd24ee9b00d4f26c8f344ce3970aa6e93935ff5		2018-08-07 17:44:51 +02:00
..
access	Merge remote-tracking branch 'origin/5.11' into dev	2018-08-07 17:44:51 +02:00
bearer	Make tests compile for Android	2018-06-25 08:01:19 +00:00
kernel	tst_qnetworkinterface: Fix for case of zero interface	2018-07-06 06:39:36 +00:00
socket	prune cargo-culted and obsolete winsock deps from autotests	2018-07-19 13:31:08 +00:00
ssl	Extend 'ignoreExpectedErrors' test	2018-08-02 04:05:27 +00:00
network.pro	Re-enable network tests on Mac OS.	2012-04-24 16:06:28 +02:00