Merge remote-tracking branch 'origin/5.4.1' into 5.4
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Tue, 10 Feb 2015 09:34:35 +0000 (10:34 +0100)
committerFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Tue, 10 Feb 2015 09:34:35 +0000 (10:34 +0100)
commit628c5e571abb3715f404ca46a9df82c4f97873a0
treed7ff2dabba16738b12a04d3a1e535147a6de207b
parentda6360b85d311d94b8d19126286404c0cc8c76fe
parentaebdf4649934e65bdab94d799da5afb2da145a37
Merge remote-tracking branch 'origin/5.4.1' into 5.4

Change-Id: I127c746c4131fc907ea4b6713d307f12a4760666
src/quick/items/qquicktext.cpp