Merge branch 'release' into stable
authorGunnar Sletta <gunnar.sletta@digia.com>
Thu, 17 Jan 2013 21:06:00 +0000 (22:06 +0100)
committerGunnar Sletta <gunnar.sletta@digia.com>
Thu, 17 Jan 2013 21:06:30 +0000 (22:06 +0100)
commit36a42ed6b11dce102d0e0f93fbd441011b003157
treefee762b914cdd525601e5bde150da82a159d86e8
parent9e11754fdceae18b49bf1b0947e48b5f81e85d59
parentfc0e916784b88a3a9ad12263ecc617c0a383664e
Merge branch 'release' into stable

Change-Id: I88ecd5f396ecd9a9c910108d1cca832a3087f1d8
src/qml/doc/qtqml.qdocconf
src/qml/qml/qqmltimer_p.h
src/qmltest/quicktest.cpp
src/quick/items/qquicktextedit_p.h
src/quick/items/qquicktextinput_p.h
src/quick/util/qquickbehavior_p.h
src/quick/util/qquickpropertychanges_p.h
src/quick/util/qquickstategroup_p.h
src/quick/util/qquicktransition_p.h
tests/auto/quick/quick.pro