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
..
signalbug	tst_qobject: Use qt_test_helper functionality	2018-07-31 05:27:01 +00:00
.gitignore	tst_qobject: Fix execution in debug&release shadow builds	2018-06-26 10:56:31 +00:00
BLACKLIST	Blacklist and skip various tests that are flakey	2015-06-14 10:50:45 +00:00
qobject.pro	tst_qobject: Use qt_test_helper functionality	2018-07-31 05:27:01 +00:00
test.pro	tst_qobject: Use qt_test_helper functionality	2018-07-31 05:27:01 +00:00
tst_qobject.cpp	Merge remote-tracking branch 'origin/5.11' into dev	2018-08-07 17:44:51 +02:00