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
..
animation	qtbase: cleanup BLACKLIST files	2018-02-13 15:20:33 +00:00
codecs	tst_qtextcodec: Use qt_test_helper functionality	2018-07-25 10:27:42 +00:00
global	QRandomGenerator: remove unnecessary cast to float in RandomValueFP	2018-07-29 19:09:16 +00:00
io	Merge remote-tracking branch 'origin/5.11' into dev	2018-08-07 17:44:51 +02:00
itemmodels	Merge branch '5.11' into dev	2018-07-31 13:33:14 +02:00
kernel	Merge remote-tracking branch 'origin/5.11' into dev	2018-08-07 17:44:51 +02:00
mimetypes	QMimeDatabase: fix assert when fetching data for invalid mimetype	2018-04-06 07:19:01 +00:00
plugin	Enable QPluginLoader test for static builds	2018-08-03 20:26:58 +00:00
serialization	Merge remote-tracking branch 'origin/5.11' into dev	2018-08-07 17:44:51 +02:00
statemachine	tst_QStateMachine: Don't use unconditional waits	2018-04-04 07:07:40 +00:00
thread	Revert "Blacklist tst_QThread::create"	2018-07-20 07:00:29 +00:00
tools	tst_QSharedPointer: raise the timeout for running qmake and makespec	2018-08-04 23:26:24 +00:00
corelib.pro	Create corelib/serialization and move existing file formats into it	2018-01-26 20:59:50 +00:00