Merge remote-tracking branch 'origin/5.5' into 5.6
authorUlf Hermann <ulf.hermann@theqtcompany.com>
Tue, 18 Aug 2015 08:29:10 +0000 (10:29 +0200)
committerUlf Hermann <ulf.hermann@theqtcompany.com>
Tue, 18 Aug 2015 08:29:47 +0000 (10:29 +0200)
commiteb30e3d7ee81c48cea720e7ecd2ed45647bc70ee
tree810e8ad0642434eeb4043c3a06c82217314300e1
parent9c9fca5e27bd91da1ea07bebd7569049493c5ccf
parent521ace713d8e5230d47f3da8cd941699ca085af2
Merge remote-tracking branch 'origin/5.5' into 5.6

Conflicts:
src/qml/debugger/qv4debugservice.cpp
src/qml/jsruntime/qv4value_inl_p.h
src/qml/jsruntime/qv4value_p.h
src/qml/memory/qv4mm.cpp
src/qml/memory/qv4mm_p.h
src/qml/qml/qqmlnotifier_p.h
src/qml/qml/qqmlproperty.cpp
src/quick/items/qquickflickable.cpp
src/quick/items/qquicktextedit.cpp
tests/auto/quick/qquickwindow/BLACKLIST

The extra changes in qqmlbinding.cpp are ported from changes to
qqmlproperty.cpp that occurred in parallel with writeBinding() being
moved to qqmlbinding.cpp.

Change-Id: I16d1920abf448c29a01822256f52153651a56356
60 files changed:
src/particles/qquickimageparticle.cpp
src/qml/compiler/qqmltypecompiler.cpp
src/qml/compiler/qv4ssa.cpp
src/qml/jsruntime/qv4arraybuffer.cpp
src/qml/jsruntime/qv4engine.cpp
src/qml/jsruntime/qv4function.cpp
src/qml/jsruntime/qv4numberobject.cpp
src/qml/jsruntime/qv4qobjectwrapper.cpp
src/qml/jsruntime/qv4runtime.cpp
src/qml/jsruntime/qv4serialize.cpp
src/qml/jsruntime/qv4string.cpp
src/qml/jsruntime/qv4string_p.h
src/qml/jsruntime/qv4typedarray.cpp
src/qml/jsruntime/qv4value_p.h
src/qml/jsruntime/qv4vme_moth.cpp
src/qml/memory/qv4mm.cpp
src/qml/memory/qv4mm_p.h
src/qml/qml/qqmlbinding.cpp
src/qml/qml/qqmlcontext.cpp
src/qml/qml/qqmlengine.cpp
src/qml/qml/qqmlimport.cpp
src/qml/qml/qqmlmetatype.cpp
src/qml/qml/qqmlnotifier_p.h
src/qml/qml/qqmlproperty.cpp
src/qml/qml/qqmlpropertycache.cpp
src/qml/qml/qqmlvaluetype.cpp
src/qml/qml/qqmlvmemetaobject.cpp
src/qml/qml/qqmlvmemetaobject_p.h
src/quick/items/context2d/qquickcanvasitem.cpp
src/quick/items/qquickflickable.cpp
src/quick/items/qquickframebufferobject.cpp
src/quick/items/qquickgridview.cpp
src/quick/items/qquickimage_p.h
src/quick/items/qquickitem.cpp
src/quick/items/qquickitemview_p_p.h
src/quick/items/qquicklistview.cpp
src/quick/items/qquickrendercontrol.cpp
src/quick/items/qquicktext.cpp
src/quick/items/qquicktext_p_p.h
src/quick/items/qquicktextcontrol.cpp
src/quick/items/qquicktextedit.cpp
src/quick/items/qquicktextinput.cpp
src/quick/items/qquicktextnodeengine.cpp
src/quick/items/qquickwindow.cpp
src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp
src/quick/scenegraph/coreapi/qsgbatchrenderer_p.h
src/quick/scenegraph/qsgrenderloop.cpp
src/quick/scenegraph/qsgthreadedrenderloop.cpp
src/quick/util/qquickanimatorjob.cpp
src/quick/util/qquickanimatorjob_p.h
src/quick/util/qquickprofiler_p.h
src/quick/util/qquickstyledtext.cpp
src/quickwidgets/qquickwidget_p.h
tests/auto/qml/qml.pro
tests/auto/qml/qqmlproperty/tst_qqmlproperty.cpp
tests/auto/quick/qquickstyledtext/tst_qquickstyledtext.cpp
tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp
tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
tools/qmlprofiler/qmlprofilerclient.cpp
tools/qmlprofiler/qmlprofilerdata.cpp