Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 7 Feb 2013 16:06:03 +0000 (17:06 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 7 Feb 2013 16:07:44 +0000 (17:07 +0100)
commitb907a01b467b551756b108f6c9a04d7e7382ae64
tree2d21d785186ce485f615034e6667d9673b62a4fc
parent4f8537ff8c9427705e3587861a62fe81cf3e503b
parent1d29d8edf8e4e709ca2f27791cdf8672c15488f3
Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
examples/quick/textureprovider/etcprovider.h
src/plugins/qmltooling/qmldbg_ost/qmlostplugin.cpp
src/qml/doc/qtqml.qdocconf
src/quick/doc/qtquick.qdocconf
tests/auto/quick/qquickflickable/tst_qquickflickable.cpp

Change-Id: I5027b0ee024e00b9525bd45516b7f401ff7d4ae4
examples/quick/textureprovider/etcprovider.h
src/qml/doc/qtqml.qdocconf
src/quick/items/context2d/qquickcontext2d.cpp
src/quick/items/qquickitem.cpp
src/quick/items/qquickwindow.cpp
tests/auto/quick/qquickflickable/tst_qquickflickable.cpp
tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp