Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 23 Jan 2013 17:27:44 +0000 (18:27 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Wed, 23 Jan 2013 17:28:44 +0000 (18:28 +0100)
commit44b7d97d565677d6decbef2d010709bdb3d7cbd4
tree853e6504899a735ff2ea02df54cf7acd07fde52f
parent40574b466a5773fdb7ccddded45e237df375d848
parent742cff521a366e907ceddbd441b8a34101e58d01
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I1656c712dfe99bc37d8ff21caa4ea51c3b375952
tests/auto/quick/qquickpathview/tst_qquickpathview.cpp
tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp