Merge remote-tracking branch 'origin/5.5' into dev
authorLiang Qi <liang.qi@theqtcompany.com>
Tue, 17 Mar 2015 15:41:03 +0000 (16:41 +0100)
committerLiang Qi <liang.qi@theqtcompany.com>
Tue, 17 Mar 2015 15:41:03 +0000 (16:41 +0100)
Change-Id: I17deb71512f5026bdf329e2235f50df76b9e6d93


Trivial merge