Merge branch 'release' of ssh://codereview.qt-project.org/qt/qtdeclarative into stable
authorSimon Hausmann <simon.hausmann@digia.com>
Tue, 26 Nov 2013 09:01:56 +0000 (10:01 +0100)
committerSimon Hausmann <simon.hausmann@digia.com>
Tue, 26 Nov 2013 09:02:56 +0000 (10:02 +0100)
commitee6aa999ab0439dcb7a95af3dc9905a6daf13491
tree8c83fc72ce62676b8431a1226f9cb9d6f39da4a0
parentf449534020adc8623ebfced5daae331ef56c4421
parentce38c71b1c300f700a9ff004b7c163cc290ecae9
Merge branch 'release' of ssh://codereview.qt-project.org/qt/qtdeclarative into stable

Change-Id: I0bf06be69927d5961f1bdb4948c3572ef6111923
src/qml/compiler/qqmlcodegenerator.cpp
src/qml/compiler/qqmlcodegenerator_p.h
src/qml/compiler/qv4isel_masm.cpp
src/qml/jsruntime/qv4engine.cpp
src/qml/qml/qqmlcompiler.cpp
src/qml/qml/qqmlengine.cpp
src/quick/items/qquickwindow.cpp