Merge remote-tracking branch 'origin/5.5' into dev
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Tue, 3 Mar 2015 17:13:37 +0000 (18:13 +0100)
committerFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Tue, 3 Mar 2015 17:13:38 +0000 (18:13 +0100)
commit6dbf435ca46e87893dc46b3f7f09a95f29998e3e
tree840394a855c4b0df25637c2c0d90ef13d228af80
parenta6c752333d6dbe76e07db39684fdb878f5fbf865
parent4d8b9373c62b9b58c54548f41f1e9d84e9522c6e
Merge remote-tracking branch 'origin/5.5' into dev

Change-Id: I94f8ae93d76bd5c120de25d9c238701afe8bfbd0
src/qml/jsruntime/qv4engine.cpp
src/qml/jsruntime/qv4globalobject.cpp
src/qml/jsruntime/qv4persistent.cpp
src/qml/jsruntime/qv4stringobject.cpp
src/qml/qml/qqmlengine.cpp