Qt Forward Merge Bot 1783fca897 Merge remote-tracking branch 'origin/5.11' into dev ... Conflicts: src/plugins/platforms/cocoa/qcocoawindow.mm src/plugins/platforms/xcb/qxcbintegration.cpp Conflicts git missed: src/plugins/platforms/qnx/qqnxglcontext.cpp Change-Id: I0582cdc9e66e43efe79038b9c43d4f9572ac88fc		2018-07-17 10:19:22 +02:00
..
pbuilder_pbx.cpp	Merge remote-tracking branch 'origin/5.11' into dev	2018-07-17 10:19:22 +02:00
pbuilder_pbx.h	Updated license headers	2016-01-21 18:55:18 +00:00