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
..
images	QImage/Jpeg: decode/encode comment attributes as utf-8	2018-03-18 09:29:06 +00:00
.gitignore	…
qimage.pro	QtGui: Add qt_imageToWinHBITMAP(), qt_imageFromWinHBITMAP()	2018-04-10 12:20:45 +00:00
qimage.qrc	…
tst_qimage.cpp	Merge remote-tracking branch 'origin/5.11' into dev	2018-08-07 17:44:51 +02:00