Merge remote-tracking branch 'origin/5.5' into dev
authorLiang Qi <liang.qi@theqtcompany.com>
Wed, 22 Apr 2015 13:04:42 +0000 (15:04 +0200)
committerLiang Qi <liang.qi@theqtcompany.com>
Wed, 22 Apr 2015 13:32:19 +0000 (15:32 +0200)
commit07782f48f4318a7261f1b0ddcd686b19ec812e36
tree3fa2aa3a1170ad7ebaf5b1641cdce19a941ca480
parent50fcdfd705c2ad9560641986bf4152b017ee8bb6
parentf15a90e5d10465e66698209a5d88f1e63ae336fa
Merge remote-tracking branch 'origin/5.5' into dev

Conflicts:
src/qml/qml/qqmlbinding.cpp
src/qml/jsruntime/qv4arraybuffer.cpp
src/qml/jsruntime/qv4functionobject.cpp

Change-Id: Ic752e9dfd69b282093651c9234c110a49762f06d
22 files changed:
src/qml/jsapi/qjsengine.cpp
src/qml/jsapi/qjsvalue.cpp
src/qml/jsruntime/qv4arraybuffer.cpp
src/qml/jsruntime/qv4arraybuffer_p.h
src/qml/jsruntime/qv4context.cpp
src/qml/jsruntime/qv4engine.cpp
src/qml/jsruntime/qv4engine_p.h
src/qml/jsruntime/qv4errorobject.cpp
src/qml/jsruntime/qv4functionobject.cpp
src/qml/jsruntime/qv4functionobject_p.h
src/qml/jsruntime/qv4qobjectwrapper.cpp
src/qml/jsruntime/qv4value_p.h
src/qml/qml/qqmlbinding.cpp
src/qml/qml/qqmlcontextwrapper.cpp
src/qml/qml/qqmlengine.cpp
src/qml/qml/qqmljavascriptexpression.cpp
src/qml/qml/qqmlproperty.cpp
src/qml/qml/qqmltypewrapper.cpp
src/qml/qml/qqmlvaluetypewrapper.cpp
src/qml/qml/qqmlvaluetypewrapper_p.h
src/qml/qml/v8/qqmlbuiltinfunctions.cpp
src/quickwidgets/qquickwidget.cpp