Merge remote-tracking branch 'origin/5.3' into 5.4
authorSimon Hausmann <simon.hausmann@digia.com>
Tue, 26 Aug 2014 07:43:33 +0000 (09:43 +0200)
committerSimon Hausmann <simon.hausmann@digia.com>
Tue, 26 Aug 2014 07:51:56 +0000 (09:51 +0200)
commite9e6f70d355499d551a26960d236644f92ea38af
tree542840d4b3b8ff82d6fab38c9ad2615d3592b793
parent916ced089f37d96ca8ef1cdb938791247bd44b72
parenteadc35f499edd25d5d1c5f803db1d61675c1cc2c
Merge remote-tracking branch 'origin/5.3' into 5.4

Conflicts:
src/qml/qml/qqmlobjectcreator_p.h
Change-Id: I60858ddb46866a8fa1a8576bb05b412afeeb4e41
16 files changed:
src/qml/jsruntime/qv4arraydata.cpp
src/qml/jsruntime/qv4globalobject.cpp
src/qml/qml/qqmlincubator.cpp
src/qml/qml/qqmlobjectcreator.cpp
src/qml/qml/qqmlobjectcreator_p.h
src/qml/qml/qqmltypeloader.cpp
src/qml/qml/qqmltypeloader_p.h
src/qml/qml/qqmlvme.cpp
src/qml/types/qqmldelegatemodel_p_p.h
src/qml/types/qqmlinstantiator.cpp
src/qml/types/qqmllistmodel.cpp
src/quick/items/context2d/qquickcontext2d.cpp
src/quick/scenegraph/qsgthreadedrenderloop.cpp
src/quick/util/qquickstatechangescript.cpp
tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
tests/auto/quick/dialogs/tst_dialogs.cpp