Merge remote-tracking branch 'origin/5.4' into 5.5
authorLiang Qi <liang.qi@theqtcompany.com>
Wed, 15 Apr 2015 07:10:02 +0000 (09:10 +0200)
committerLiang Qi <liang.qi@theqtcompany.com>
Wed, 15 Apr 2015 07:10:02 +0000 (09:10 +0200)
commit5b1a3318125b72563b5de1bf7549088165ec60f4
tree1aec8465db302fc7228cfd060d6ee132a99a69bd
parentc3035a1655090b0f6b194fb8a7586c013ef24f6a
parent98f83553e9fe2aa5fc54b32513af6ba3aa60a07b
Merge remote-tracking branch 'origin/5.4' into 5.5

Change-Id: Ib6f1512a15f2714a712ff82df55a9d3de8e46ffd
src/plugins/imageformats/dds/qddshandler.cpp
src/plugins/imageformats/tiff/qtiffhandler.cpp