Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 4 Jul 2013 13:32:50 +0000 (15:32 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 4 Jul 2013 13:32:51 +0000 (15:32 +0200)
commit81077291e3ae1fe8819cf58471ee09ad66c9cad1
treec0e7a482affcdfa38ee9a2ec305d02b543ad25d8
parentea045d82a3a837f83fec82462feebf2bc262f9d9
parent9422bb302882bfe9e3123d8f1542507c6b6577f4
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I15cb7460171b38d11d66367aeb0831ec6e3ca933
src/qml/qml/qqmlengine.cpp
src/quick/items/qquicktext.cpp
src/quick/items/qquicktextedit.cpp
src/quick/items/qquicktextedit_p_p.h