From 0464d42b101eaf60c62be751785009d09065f2cf 2016-05-19 19:25:54
From: Liang Qi <liang.qi@qt.io>
Date: 2016-05-19 19:25:54
Subject: [PATCH] Merge remote-tracking branch 'origin/5.6' into 5.7

Conflicts:
	src/charts/doc/qtcharts.qdocconf

Change-Id: If6160b2f643e7df8c32400b97afac229b95b78de

---