Allow all explicit margins to override margins.
authorAndrew den Exter <andrew.den-exter@nokia.com>
Fri, 29 Jun 2012 07:06:38 +0000 (17:06 +1000)
committerQt by Nokia <qt-info@nokia.com>
Fri, 6 Jul 2012 03:24:45 +0000 (05:24 +0200)
commitaeac9840e4c46786e84ab7eb16a89db22d4ff81a
tree2aaae5a3dccfa9ee447f0896a659cc60caba5b86
parentea9c14f3e1a42080be03d95b825a7ba8ed303bbc
Allow all explicit margins to override margins.

Task-number: QTBUG-24515
Change-Id: Ibfc657dec9fd0c8e71cf3686a04ea7b00ad72c11
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
src/quick/items/qquickanchors.cpp
src/quick/items/qquickanchors_p.h
src/quick/items/qquickanchors_p_p.h
src/quick/items/qquickitem.cpp
tests/auto/quick/qquickanchors/data/individualMargins.qml [new file with mode: 0644]
tests/auto/quick/qquickanchors/tst_qquickanchors.cpp