Update plugins.qmltypes

Change-Id: I5e3ff34d8724fab19408f42984308ca12b4ff521
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Fix static linking when using libpoly2tri

Task-number: QTBUG-43006
Change-Id: I2143b815d8b597f3a02e8bd18021f6133fa9ea17
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Remove unused private member

Found by Clang 3.6:
qdeclarativegeomapquickitem_p.h:92:10: warning: private field 'inUpdate_' is not used [-Wunused-private-field]

Change-Id: Ifeb46931cf1a322a667594a2dd3c7fe74d89b171
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Bump version

Change-Id: Ie9f06be2e745ebd94ce5edd0a9f1a29457fa311c
Merge remote-tracking branch 'origin/5.4.0' into 5.4

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

Conflicts:
	.qmake.conf

Change-Id: I230ee2f071d62769139bf1250ab30f9107afe7c2