Bump version

Change-Id: Idd9e1d79ccde1c4fe4d5bda0007f6a4c357e5840
Silence warning about unused parameter

It's only used in debug mode.

qjp2handler.cpp:1183:55: warning: unused parameter 'image' [-Wunused-parameter]

Change-Id: I0260f21dbee2105f297af0224e25f14a88ee4557
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Merge remote-tracking branch 'origin/5.3' into 5.4

Conflicts:
	.qmake.conf

Change-Id: I4453973e64dc6488fce35b2eccf98ead5d1006e8
Fix libmng test.

libmng pulls in libjpeg. In turn libjpeg requires that code that uses it should
include stdio.h [0].

[0] <https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=461602#10>

So adding the corresponding include before libmng solves the issue.

Change-Id: I7cfbda727ed5b71b668d6597358a5e9c7d8918bb
Reviewed-by: Dmitry Shachnev <mitya57@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com>
Merge remote-tracking branch 'origin/5.4' into dev

Change-Id: I7672ca8c233430d2e5e0627f55c782ea123d93fa