Liang Qi ccf26f6a88 Merge remote-tracking branch 'origin/5.11' into 5.12 ... Conflicts: src/plugins/platformthemes/platformthemes.pro src/printsupport/kernel/qplatformprintdevice.cpp Change-Id: Iac01729ad954bb1c7af5867d982eb243b2139ee6		2018-10-17 10:35:28 +02:00
..
cocoa	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-03-11 20:08:50 +01:00
cups	Merge remote-tracking branch 'origin/5.11' into 5.12	2018-10-17 10:35:28 +02:00
windows	Remove some misplaced sizeof() scalings on array sizes for new[]	2018-09-03 08:53:46 +00:00
printsupport.pro	Modularize configure.json/.pri	2016-09-15 08:23:53 +00:00