Merge remote-tracking branch 'origin/5.3' into 5.4
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 14 Aug 2014 09:35:11 +0000 (11:35 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 14 Aug 2014 09:35:30 +0000 (11:35 +0200)
commit809b5e2fc1cc5935c2dd7d63992c7a94dfce4dd8
treec0f08d106a16f12a89e13550d58d424d0f9cba6a
parentdc4e537d4cfe16aaa88b6edd911571317241ab32
parentda7df10b3d5769d1da7851895d27257a0d930012
Merge remote-tracking branch 'origin/5.3' into 5.4

Change-Id: I2e06c2fcd8aa9d5d090f0568be75272ec82f7b20
src/qml/jit/qv4assembler_p.h
src/quick/items/context2d/qquickcontext2d.cpp
tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp