Merge branch 'release' of ssh://codereview.qt-project.org/qt/qtdeclarative into stable

Change-Id: I0bf06be69927d5961f1bdb4948c3572ef6111923

diff --cc src/qml/compiler/qqmlcodegenerator.cpp
Simple merge

diff --cc src/qml/compiler/qqmlcodegenerator_p.h
Simple merge

diff --cc src/qml/compiler/qv4isel_masm.cpp
Simple merge

diff --cc src/qml/jsruntime/qv4engine.cpp
Simple merge

diff --cc src/qml/qml/qqmlcompiler.cpp
Simple merge

diff --cc src/qml/qml/qqmlengine.cpp
Simple merge

diff --cc src/quick/items/qquickwindow.cpp
Simple merge