Merge remote-tracking branch 'origin/5.4' into 5.5
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Tue, 17 Mar 2015 08:48:35 +0000 (09:48 +0100)
committerFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Tue, 17 Mar 2015 08:48:36 +0000 (09:48 +0100)
commit8d5a2f2a81a001ff64e1a798dc34c61e9ad00b6d
tree22c73b798dc55c47a6b3524eb79aed85716abf59
parent84155a8e1a6250d3e4b0949a42464eee5dfef537
parentdec6b8a8d294bc6193f680c5b5038dc12b6ae17c
Merge remote-tracking branch 'origin/5.4' into 5.5

Change-Id: I4c338a44c1d64c2d8e637971ab3ec6982c40a685
src/qml/jsruntime/qv4dateobject.cpp
src/qml/jsruntime/qv4global_p.h
src/quick/items/qquickitem.cpp
tests/testapplications/text/textedit.qml