Rework the project layout (no code change)
Merge remote-tracking branch 'origin/master' into schoumi

Conflicts:
	qtwidgetsextra/qtwidgetsextra.pro