• Sergio Ahumada's avatar
    Merge branch 'stable' into dev · af445597
    Sergio Ahumada authored
    Conflicts:
    	src/qml/debugger/qv8debugservice.cpp
    	src/qml/qml/v8/qv8engine.cpp
    	tests/auto/quick/qquickitem/qquickitem.pro
    
    Change-Id: Ic4a1dcdd8b8a84155d2f2abefdf1da5c3a56af31
    af445597