Merge remote-tracking branch 'origin/5.3' into 5.4

author Frederik Gladhorn <frederik.gladhorn@digia.com>

Thu, 14 Aug 2014 09:35:11 +0000 (11:35 +0200)

committer Frederik Gladhorn <frederik.gladhorn@digia.com>

Thu, 14 Aug 2014 09:35:30 +0000 (11:35 +0200)
author Frederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 14 Aug 2014 09:35:11 +0000 (11:35 +0200)
committer Frederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 14 Aug 2014 09:35:30 +0000 (11:35 +0200)
diff --cc src/qml/jit/qv4assembler_p.h
Simple merge
diff --cc src/quick/items/context2d/qquickcontext2d.cpp
Simple merge
diff --cc tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp
Simple merge
author	Frederik Gladhorn <frederik.gladhorn@digia.com>
	Thu, 14 Aug 2014 09:35:11 +0000 (11:35 +0200)
committer	Frederik Gladhorn <frederik.gladhorn@digia.com>
	Thu, 14 Aug 2014 09:35:30 +0000 (11:35 +0200)
		1	2
src/qml/jit/qv4assembler_p.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/quick/items/context2d/qquickcontext2d.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp	patch \|	diff1 \|	diff2 \|	blob \| history