Conflicts:
	src/libs/symbianutils/symbianutils.qbs
	src/libs/utils/utils.qbs
	src/libs/zeroconf/zeroconf.qbs

Change-Id: I4c888d8e58ec68dc4638b041b0c6ee743b809ab4