Merge remote-tracking branch 'origin/5.5' into dev
authorSimon Hausmann <simon.hausmann@theqtcompany.com>
Thu, 4 Jun 2015 08:24:46 +0000 (10:24 +0200)
committerSimon Hausmann <simon.hausmann@theqtcompany.com>
Thu, 4 Jun 2015 08:28:48 +0000 (10:28 +0200)
commit9556f6d075b61fa95d6e1057f305e522a26f71d6
tree53190472453390810c47b9b5a47b23188a00267e
parent42ffe9b193a5bd958b0853233fd0d94170722bd1
parent1fd0cdc6a2e01775d8a79c6614910cc5a2fbf2b3
Merge remote-tracking branch 'origin/5.5' into dev

Conflicts:
src/qml/jsruntime/qv4engine_p.h
src/quick/items/qquickitemsmodule.cpp
src/quick/items/qquicktext.cpp
src/quick/util/qquickpixmapcache.cpp
tests/auto/quick/qquickwindow/tst_qquickwindow.cpp

Change-Id: I90ecaad6a4bfaa4f36149a7463f4d7141f4a516a
29 files changed:
src/qml/compiler/qqmlirbuilder.cpp
src/qml/compiler/qv4codegen.cpp
src/qml/compiler/qv4compiler.cpp
src/qml/jsruntime/qv4arraydata.cpp
src/qml/jsruntime/qv4engine.cpp
src/qml/jsruntime/qv4engine_p.h
src/qml/jsruntime/qv4qobjectwrapper.cpp
src/qml/jsruntime/qv4qobjectwrapper_p.h
src/qml/memory/qv4mm.cpp
src/qml/qml/qqmldata_p.h
src/qml/qml/qqmlvmemetaobject.cpp
src/qml/qml/qqmlxmlhttprequest.cpp
src/quick/items/qquickimage_p.h
src/quick/items/qquickitemsmodule.cpp
src/quick/items/qquicktext.cpp
src/quick/items/qquicktextedit.cpp
src/quick/items/qquicktextinput.cpp
src/quick/items/qquickwindow.cpp
src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp
src/quick/scenegraph/qsgrenderloop.cpp
src/quick/scenegraph/qsgthreadedrenderloop.cpp
src/quick/util/qquickimageprovider.h
src/quick/util/qquickpixmapcache.cpp
src/quick/util/qquicktimeline.cpp
src/quickwidgets/qquickwidget.cpp
tests/auto/quick/qquicktext/tst_qquicktext.cpp
tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp
tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
tools/qmllint/main.cpp