Fix mixed up vendor and product identifiers

Caused by I1a66164c.

Change-Id: I78973a509ff91a1302f435b1a23ecce432e56dd4
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
Bump version

Change-Id: I50ea328c903f3ba0c78f9570b6b6b892bb38f976
Merge remote-tracking branch 'origin/5.3' into dev

Conflicts:
	.qmake.conf

Change-Id: Ib1727ebdc69ab673d782c39ba9f1b5f51c192d4b