Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 25 Feb 2013 10:57:50 +0000 (11:57 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 25 Feb 2013 10:57:50 +0000 (11:57 +0100)
commit15dc45ce109fe41699950a9b87282901b21f2d3d
tree809e79e7b55988006bb3d990168b2bb7eda360b5
parentcf53bf9ae6716613c120cc4a0202c69bd59eba1e
parenta496e0874858a4b7d991c179c0e12df46c3d324c
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Ia02971527a2d1a80c5624d69330428818aab3a41
src/qml/util/qqmlpropertymap.h
src/quick/items/qquicklistview.cpp
src/quick/scenegraph/util/qsgsimplematerial.h
src/quick/scenegraph/util/qsgtexturematerial.h
tests/auto/quick/qquickflickable/tst_qquickflickable.cpp
tests/auto/quick/qquickgridview/tst_qquickgridview.cpp
tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp
tests/auto/quick/quick.pro