Merge remote-tracking branch 'origin/5.5' into dev
authorSimon Hausmann <simon.hausmann@theqtcompany.com>
Tue, 28 Apr 2015 08:57:34 +0000 (10:57 +0200)
committerSimon Hausmann <simon.hausmann@theqtcompany.com>
Tue, 28 Apr 2015 12:29:59 +0000 (14:29 +0200)
commit94db5de2acefb6e96d4f6cfda2df14905a5e63c5
treec361f5dd4989ee0743e2a9f94b64dbb2127e5dea
parent11f67b80c4eab4b1e3eb8e6b1e8b69e7a60e42a9
parentdee67b41b031791c7b6313e935e622ef8d594686
Merge remote-tracking branch 'origin/5.5' into dev

Conflicts:
tests/auto/quick/qquicktext/tst_qquicktext.cpp

Change-Id: I075e742da8396a268d97d3ab34bcd9e0c0cf001f
src/qml/jsruntime/qv4engine.cpp
src/qml/qml/qqmlvaluetypewrapper.cpp
src/quick/scenegraph/qsgrenderloop.cpp
src/quick/scenegraph/qsgthreadedrenderloop.cpp
tests/auto/qml/qqmlxmlhttprequest/data/receive_json_data.expect
tests/auto/qml/qqmlxmlhttprequest/tst_qqmlxmlhttprequest.cpp
tests/auto/quick/qquickborderimage/tst_qquickborderimage.cpp
tests/auto/quick/qquickimage/tst_qquickimage.cpp
tests/auto/quick/qquicktext/tst_qquicktext.cpp
tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp
tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp