Remove unnecessary \inqmlmodule parameter

Change-Id: Ib685e533a97bae865df5802c4f9e7399c8cfd078
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Bump version

Change-Id: I1c61bf871b41c725416b4f17ee258177d95fdd8d
Merge remote-tracking branch 'origin/5.4' into dev

Conflicts:
	.qmake.conf

Change-Id: Ie64aa3089d47063e82f8d1cb77929deee86c62ea