Hardcode QtQml version import in .pro file

This allows the plugins.qmltypes file to be updated by just running

   make qmltypes

Change-Id: I0872082645e9d4d8879e3a3479aea80494248894
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
Bump version

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

Conflicts:
	.qmake.conf

Change-Id: Ifee77abab352e92b52a2ddba16447107005e3253