Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 14 Mar 2013 08:30:12 +0000 (09:30 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 14 Mar 2013 08:30:12 +0000 (09:30 +0100)
commit11484c7f64b5942994a1d1a07f4e7f4d86e94e83
treef0c901d1d15d0bcb8ce572a04b094e510cd86ddd
parenta1a7679028eda395d74cd1247a8c3ed46ac3bef1
parentb58953fae3dc80c52e846d2d87856dd20b8986ab
Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
tests/auto/qml/debugger/qv8profilerservice/qv8profilerservice.pro

Change-Id: I2fd99ed8bd03302b9bbf31e6f21990f6455c4f1c
12 files changed:
src/quick/items/qquickgridview.cpp
src/quick/items/qquicktextedit.cpp
src/quick/scenegraph/coreapi/qsggeometry.h
src/quick/scenegraph/coreapi/qsgmaterial.h
src/quick/scenegraph/qsgdefaultglyphnode_p.cpp
src/quick/scenegraph/util/qsgflatcolormaterial.h
src/quick/scenegraph/util/qsgtexture.h
tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
tests/auto/quick/qquickflickable/tst_qquickflickable.cpp
tests/auto/quick/qquickimage/tst_qquickimage.cpp
tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp
tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp