2

2
Merge remote-tracking branch 'origin/master'

Conflicts:
	QtCppSample/FontIssueSample/FontHeightIssue.qml
	QtCppSample/QtCppSample.pro.user