Merge remote-tracking branch 'origin/5.3' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 10 Jul 2014 08:12:12 +0000 (10:12 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 10 Jul 2014 08:12:13 +0000 (10:12 +0200)
Change-Id: Iba61035910c46627e5e1c3824757da7b3d573657

1  2 
src/qml/qml/qqmlengine.cpp
src/qml/types/qqmllistmodel.cpp
src/quick/accessible/qaccessiblequickitem.cpp
src/quick/doc/qtquick.qdocconf
src/quick/items/qquickimage.cpp
src/quick/items/qquicklistview.cpp
src/quick/items/qquickmousearea.cpp
src/quick/items/qquicktextinput.cpp
src/quick/scenegraph/qsgrenderloop.cpp
src/quick/util/qquickpropertychanges.cpp

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge