Merge remote-tracking branch 'origin/5.3' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 29 Jul 2014 10:49:37 +0000 (12:49 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Tue, 29 Jul 2014 10:49:37 +0000 (12:49 +0200)
commit8b88e37bf79a53eb0cb34226aacb25ad9b01d7cf
tree6087ee08b55f69f9c4981d9026d3162f2ee50c31
parent61edb86ed4cc0ac31d77d3793936fa1e8476b504
parent7ceca6ac0535a957e9f87f789119c288f6d93837
Merge remote-tracking branch 'origin/5.3' into dev

Change-Id: Id95f7b01de36bccecbb7b73acc041654a1fe2ebe
src/qml/compiler/qqmltypecompiler.cpp
src/qml/qml/qqmlobjectcreator.cpp
src/quick/items/qquickmousearea_p.h
src/quick/items/qquickshadereffectsource.cpp
tests/auto/qml/qqmlecmascript/testtypes.cpp
tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp