Merge remote-tracking branch 'origin/5.3' into 5.4
authorSimon Hausmann <simon.hausmann@digia.com>
Tue, 12 Aug 2014 08:03:53 +0000 (10:03 +0200)
committerSimon Hausmann <simon.hausmann@digia.com>
Tue, 12 Aug 2014 08:04:33 +0000 (10:04 +0200)
commit61f72d32b4fddc6e87f21d0243d9f0a32ca61987
treeb166541b885e33666bc3dffbde937b5dc0e93bc5
parent430853836f9c17154ef3ee4cac6b03b90ee493a9
parent01c6af3fc940378e8eee41a9fb8273420ef5a7e1
Merge remote-tracking branch 'origin/5.3' into 5.4

Conflicts:
src/qml/jsruntime/qv4include.cpp
src/quick/items/qquickrendercontrol.cpp
src/quick/items/qquickrendercontrol_p.h
src/quickwidgets/qquickwidget.cpp

Change-Id: Ib2dc0051a38cd283a37a7665eb4a76f6f7ec8b15
src/qml/compiler/qqmltypecompiler.cpp
src/qml/jsruntime/qv4include.cpp
src/qml/qml/qqmlcomponent.cpp
src/qml/qml/qqmlincubator.cpp
src/quick/items/qquickframebufferobject.cpp
src/quick/items/qquickpathview.cpp
src/quick/util/qquickanimatorjob.cpp
tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp