Merge remote-tracking branch 'origin/5.5' into 5.6
authorSimon Hausmann <simon.hausmann@theqtcompany.com>
Wed, 2 Sep 2015 15:19:03 +0000 (17:19 +0200)
committerSimon Hausmann <simon.hausmann@theqtcompany.com>
Wed, 2 Sep 2015 15:19:48 +0000 (17:19 +0200)
commit149ece7a0cfb4fc90fe4544379ee2772fde881fd
tree6a8a3ec11beb53eb06ccc69a0ec04a9d80053c0e
parent9ee31a6ae852eb347951e371958dd435409c9941
parentd1b20513798ed441afddb87fd4e7facce78349e1
Merge remote-tracking branch 'origin/5.5' into 5.6

Change-Id: Ibc7a47f7ce6d15dff79fdc59f8ded297d1b8d50d
src/qml/jsapi/qjsvalue.cpp
src/qml/qml/qqmlvaluetype.cpp
src/quick/items/context2d/qquickcontext2d.cpp
tests/auto/qml/qqmlvaluetypes/tst_qqmlvaluetypes.cpp
tools/qmlplugindump/main.cpp