Merge branch 'anchorlayout' of git@gitorious.org:+openbossa-developers/qt/openbossa-clone

Conflicts:
	src/gui/graphicsview/graphicsview.pri

4 files changed, 874 insertions, 0 deletions

diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 411e7eb..e9e1c8a 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -137,6 +137,7 @@ SUBDIRS += \
            qgraphicsgridlayout \
            qgraphicsitem \
            qgraphicsitemanimation \
+           qgraphicsanchorlayout \
            qgraphicslayout \
            qgraphicslayoutitem \
            qgraphicslinearlayout \
diff --git a/tests/auto/qgraphicsanchorlayout/qgraphicsanchorlayout.pro b/tests/auto/qgraphicsanchorlayout/qgraphicsanchorlayout.pro
new file mode 100644
index 0000000..4c065f4
--- /dev/null
+++ b/tests/auto/qgraphicsanchorlayout/qgraphicsanchorlayout.pro
@@ -0,0 +1,3 @@
+load(qttest_p4)
+SOURCES  += tst_qgraphicsanchorlayout.cpp
+
diff --git a/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp b/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
new file mode 100644
index 0000000..a579ba5
--- /dev/null
+++ b/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
@@ -0,0 +1,868 @@
+#include <QtTest/QtTest>
+#include <qgraphicsanchorlayout.h>
+#include <qgraphicswidget.h>
+#include <qgraphicsproxywidget.h>
+#include <QtGui/qgraphicsview.h>
+
+class tst_QGraphicsAnchorLayout : public QObject {
+    Q_OBJECT;
+
+private slots:
+    void simple();
+    void diagonal();
+    void parallel();
+    void parallel2();
+    void snake();
+    void snakeOppositeDirections();
+    void fairDistribution();
+    void fairDistributionOppositeDirections();
+    void proportionalPreferred();
+    void example();
+    void setSpacing();
+
+};
+
+class RectWidget : public QGraphicsWidget
+{
+public:
+    RectWidget(QGraphicsItem *parent = 0) : QGraphicsWidget(parent){}
+
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+    {
+        Q_UNUSED(option);
+        Q_UNUSED(widget);
+        painter->drawRoundRect(rect());
+        painter->drawLine(rect().topLeft(), rect().bottomRight());
+        painter->drawLine(rect().bottomLeft(), rect().topRight());
+    }
+};
+
+static QGraphicsWidget *createItem(const QSizeF &minimum = QSizeF(100.0, 100.0),
+                                   const QSizeF &preferred = QSize(150.0, 100.0),
+                                   const QSizeF &maximum = QSizeF(200.0, 100.0),
+                                   const QString &name = QString())
+{
+    QGraphicsWidget *w = new RectWidget;
+    w->setMinimumSize(minimum);
+    w->setPreferredSize(preferred);
+    w->setMaximumSize(maximum);
+    w->setData(0, name);
+    return w;
+}
+
+void tst_QGraphicsAnchorLayout::simple()
+{
+    QGraphicsWidget *w1 = createItem();
+    QGraphicsWidget *w2 = createItem();
+
+    QGraphicsAnchorLayout *l = new QGraphicsAnchorLayout;
+    l->setContentsMargins(0, 0, 0, 0);
+    l->addAnchor(w1, Qt::AnchorRight, w2, Qt::AnchorLeft);
+
+    QGraphicsWidget p;
+    p.setLayout(l);
+
+    QCOMPARE(l->count(), 2);
+}
+
+void tst_QGraphicsAnchorLayout::diagonal()
+{
+    QSizeF min(10, 100);
+    QSizeF pref(70, 100);
+    QSizeF max(100, 100);
+
+    QGraphicsWidget *a = createItem(min, pref, max, "A");
+    QGraphicsWidget *b = createItem(min, pref, max, "B");
+    QGraphicsWidget *c = createItem(min, pref, max, "C");
+    QGraphicsWidget *d = createItem(min, pref, max, "D");
+    QGraphicsWidget *e = createItem(min, pref, max, "E");
+
+    QGraphicsAnchorLayout *l = new QGraphicsAnchorLayout;
+    l->setContentsMargins(0, 0, 0, 0);
+
+    // vertical
+    l->addAnchor(a, Qt::AnchorTop, l, Qt::AnchorTop);
+    l->setAnchorSpacing(a, Qt::AnchorTop, l, Qt::AnchorTop, 0);
+
+    l->addAnchor(b, Qt::AnchorTop, l, Qt::AnchorTop);
+    l->setAnchorSpacing(b, Qt::AnchorTop, l, Qt::AnchorTop, 0);
+
+    l->addAnchor(c, Qt::AnchorTop, a, Qt::AnchorBottom);
+    l->setAnchorSpacing(c, Qt::AnchorTop, a, Qt::AnchorBottom, 0);
+    l->addAnchor(c, Qt::AnchorTop, b, Qt::AnchorBottom);
+    l->setAnchorSpacing(c, Qt::AnchorTop, b, Qt::AnchorBottom, 0);
+    l->addAnchor(c, Qt::AnchorBottom, d, Qt::AnchorTop);
+    l->setAnchorSpacing(c, Qt::AnchorBottom, d, Qt::AnchorTop, 0);
+    l->addAnchor(c, Qt::AnchorBottom, e, Qt::AnchorTop);
+    l->setAnchorSpacing(c, Qt::AnchorBottom, e, Qt::AnchorTop, 0);
+
+    l->addAnchor(d, Qt::AnchorBottom, l, Qt::AnchorBottom);
+    l->setAnchorSpacing(d, Qt::AnchorBottom, l, Qt::AnchorBottom, 0);
+    l->addAnchor(e, Qt::AnchorBottom, l, Qt::AnchorBottom);
+    l->setAnchorSpacing(e, Qt::AnchorBottom, l, Qt::AnchorBottom, 0);
+
+    // horizontal
+    l->addAnchor(l, Qt::AnchorLeft, a, Qt::AnchorLeft);
+    l->setAnchorSpacing(l, Qt::AnchorLeft, a, Qt::AnchorLeft, 0);
+    l->addAnchor(l, Qt::AnchorLeft, d, Qt::AnchorLeft);
+    l->setAnchorSpacing(l, Qt::AnchorLeft, d, Qt::AnchorLeft, 0);
+    l->addAnchor(a, Qt::AnchorRight, b, Qt::AnchorLeft);
+    l->setAnchorSpacing(a, Qt::AnchorRight, b, Qt::AnchorLeft, 0);
+
+    l->addAnchor(a, Qt::AnchorRight, c, Qt::AnchorLeft);
+    l->setAnchorSpacing(a, Qt::AnchorRight, c, Qt::AnchorLeft, 0);
+    l->addAnchor(c, Qt::AnchorRight, e, Qt::AnchorLeft);
+    l->setAnchorSpacing(c, Qt::AnchorRight, e, Qt::AnchorLeft, 0);
+
+    l->addAnchor(b, Qt::AnchorRight, l, Qt::AnchorRight);
+    l->setAnchorSpacing(b, Qt::AnchorRight, l, Qt::AnchorRight, 0);
+    l->addAnchor(e, Qt::AnchorRight, l, Qt::AnchorRight);
+    l->setAnchorSpacing(e, Qt::AnchorRight, l, Qt::AnchorRight, 0);
+    l->addAnchor(d, Qt::AnchorRight, e, Qt::AnchorLeft);
+    l->setAnchorSpacing(d, Qt::AnchorRight, e, Qt::AnchorLeft, 0);
+
+    QCOMPARE(l->count(), 5);
+
+    QGraphicsWidget p;
+    p.setLayout(l);
+
+    QSizeF layoutMinimumSize = l->effectiveSizeHint(Qt::MinimumSize);
+    QSizeF layoutMaximumSize = l->effectiveSizeHint(Qt::MaximumSize);
+    QSizeF layoutPreferredSize = l->effectiveSizeHint(Qt::PreferredSize);
+
+    QCOMPARE(layoutMinimumSize, QSizeF(30.0, 300.0));
+    QCOMPARE(layoutPreferredSize, QSizeF(170.0, 300.0));
+    QCOMPARE(layoutMaximumSize, QSizeF(190.0, 300.0));
+
+    p.resize(layoutMinimumSize);
+    QCOMPARE(a->geometry(), QRectF(0.0, 0.0, 10.0, 100.0));
+    QCOMPARE(b->geometry(), QRectF(10.0, 0.0, 20.0, 100.0));
+    QCOMPARE(c->geometry(), QRectF(10.0, 100.0, 10.0, 100.0));
+    QCOMPARE(d->geometry(), QRectF(0.0, 200.0, 20.0, 100.0));
+    QCOMPARE(e->geometry(), QRectF(20.0, 200.0, 10.0, 100.0));
+    QCOMPARE(p.size(), layoutMinimumSize);
+
+    p.resize(layoutPreferredSize);
+    QCOMPARE(a->geometry(), QRectF(0.0, 0.0, 70.0, 100.0));
+    QCOMPARE(b->geometry(), QRectF(70.0, 0.0, 100.0, 100.0));
+    QCOMPARE(c->geometry(), QRectF(70.0, 100.0, 30.0, 100.0));
+    QCOMPARE(d->geometry(), QRectF(0.0, 200.0, 100.0, 100.0));
+    QCOMPARE(e->geometry(), QRectF(100.0, 200.0, 70.0, 100.0));
+    QCOMPARE(p.size(), layoutPreferredSize);
+
+    p.resize(layoutMaximumSize);
+    QCOMPARE(a->geometry(), QRectF(0.0, 0.0, 90.0, 100.0));
+    QCOMPARE(b->geometry(), QRectF(90.0, 0.0, 100.0, 100.0));
+    QCOMPARE(c->geometry(), QRectF(90.0, 100.0, 10.0, 100.0));
+    QCOMPARE(d->geometry(), QRectF(0.0, 200.0, 100.0, 100.0));
+    QCOMPARE(e->geometry(), QRectF(100.0, 200.0, 90.0, 100.0));
+    QCOMPARE(p.size(), layoutMaximumSize);
+
+    QSizeF testA(175.0, 300.0);
+    p.resize(testA);
+    QCOMPARE(a->geometry(), QRectF(0.0, 0.0, 75.0, 100.0));
+    QCOMPARE(b->geometry(), QRectF(75.0, 0.0, 100.0, 100.0));
+    QCOMPARE(c->geometry(), QRectF(75.0, 100.0, 25.0, 100.0));
+    QCOMPARE(d->geometry(), QRectF(0.0, 200.0, 100.0, 100.0));
+    QCOMPARE(e->geometry(), QRectF(100.0, 200.0, 75.0, 100.0));
+    QCOMPARE(p.size(), testA);
+}
+
+void tst_QGraphicsAnchorLayout::parallel()
+{
+    QGraphicsWidget *a = createItem(QSizeF(100, 100),
+                                    QSizeF(150, 100),
+                                    QSizeF(200, 100), "A");
+
+    QGraphicsWidget *b = createItem(QSizeF(100, 100),
+                                    QSizeF(150, 100),
+                                    QSizeF(300, 100), "B");
+
+    QGraphicsWidget *c = createItem(QSizeF(100, 100),
+                                    QSizeF(200, 100),
+                                    QSizeF(350, 100), "C");
+
+    QGraphicsWidget *d = createItem(QSizeF(100, 100),
+                                    QSizeF(170, 100),
+                                    QSizeF(200, 100), "D");
+
+    QGraphicsWidget *e = createItem(QSizeF(150, 100),
+                                    QSizeF(150, 100),
+                                    QSizeF(200, 100), "E");
+
+    QGraphicsWidget *f = createItem(QSizeF(100, 100),
+                                    QSizeF(150, 100),
+                                    QSizeF(200, 100), "F");
+
+    QGraphicsAnchorLayout *l = new QGraphicsAnchorLayout;
+    l->setContentsMargins(0, 0, 0, 0);
+
+    l->addAnchor(l, Qt::AnchorTop, a, Qt::AnchorTop);
+    l->setAnchorSpacing(l, Qt::AnchorTop, a, Qt::AnchorTop, 0);
+    l->addAnchor(a, Qt::AnchorBottom, b, Qt::AnchorTop);
+    l->setAnchorSpacing(a, Qt::AnchorBottom, b, Qt::AnchorTop, 0);
+    l->addAnchor(b, Qt::AnchorBottom, c, Qt::AnchorTop);
+    l->setAnchorSpacing(b, Qt::AnchorBottom, c, Qt::AnchorTop, 0);
+    l->addAnchor(c, Qt::AnchorBottom, d, Qt::AnchorTop);
+    l->setAnchorSpacing(c, Qt::AnchorBottom, d, Qt::AnchorTop, 0);
+    l->addAnchor(d, Qt::AnchorBottom, e, Qt::AnchorTop);
+    l->setAnchorSpacing(d, Qt::AnchorBottom, e, Qt::AnchorTop, 0);
+    l->addAnchor(e, Qt::AnchorBottom, f, Qt::AnchorTop);
+    l->setAnchorSpacing(e, Qt::AnchorBottom, f, Qt::AnchorTop, 0);
+    l->addAnchor(f, Qt::AnchorBottom, l, Qt::AnchorBottom);
+    l->setAnchorSpacing(f, Qt::AnchorBottom, l, Qt::AnchorBottom, 0);
+
+    l->addAnchor(l, Qt::AnchorLeft, a, Qt::AnchorLeft);
+    l->setAnchorSpacing(l, Qt::AnchorLeft, a, Qt::AnchorLeft, 0);
+    l->addAnchor(a, Qt::AnchorRight, b, Qt::AnchorLeft);
+    l->setAnchorSpacing(a, Qt::AnchorRight, b, Qt::AnchorLeft, 0);
+    l->addAnchor(a, Qt::AnchorRight, c, Qt::AnchorLeft);
+    l->setAnchorSpacing(a, Qt::AnchorRight, c, Qt::AnchorLeft, 0);
+    l->addAnchor(b, Qt::AnchorRight, d, Qt::AnchorLeft);
+    l->setAnchorSpacing(b, Qt::AnchorRight, d, Qt::AnchorLeft, 0);
+    l->addAnchor(b, Qt::AnchorRight, e, Qt::AnchorLeft);
+    l->setAnchorSpacing(b, Qt::AnchorRight, e, Qt::AnchorLeft, 0);
+    l->addAnchor(c, Qt::AnchorRight, f, Qt::AnchorLeft);
+    l->setAnchorSpacing(c, Qt::AnchorRight, f, Qt::AnchorLeft, 0);
+    l->addAnchor(d, Qt::AnchorRight, f, Qt::AnchorLeft);
+    l->setAnchorSpacing(d, Qt::AnchorRight, f, Qt::AnchorLeft, 0);
+    l->addAnchor(e, Qt::AnchorRight, f, Qt::AnchorLeft);
+    l->setAnchorSpacing(e, Qt::AnchorRight, f, Qt::AnchorLeft, 0);
+    l->addAnchor(f, Qt::AnchorRight, l, Qt::AnchorRight);
+    l->setAnchorSpacing(f, Qt::AnchorRight, l, Qt::AnchorRight, 0);
+
+    QCOMPARE(l->count(), 6);
+
+    QGraphicsWidget p;
+    p.setLayout(l);
+
+    QSizeF layoutMinimumSize = l->effectiveSizeHint(Qt::MinimumSize);
+    QSizeF layoutPreferredSize = l->effectiveSizeHint(Qt::PreferredSize);
+    QSizeF layoutMaximumSize = l->effectiveSizeHint(Qt::MaximumSize);
+
+    QCOMPARE(layoutMinimumSize, QSizeF(450, 600));
+    QCOMPARE(layoutPreferredSize, QSizeF(620, 600));
+    QCOMPARE(layoutMaximumSize, QSizeF(750, 600));
+
+    p.resize(layoutMinimumSize);
+    QCOMPARE(a->geometry(), QRectF(0, 0, 100, 100));
+    QCOMPARE(b->geometry(), QRectF(100, 100, 100, 100));
+    QCOMPARE(c->geometry(), QRectF(100, 200, 250, 100));
+    QCOMPARE(d->geometry(), QRectF(200, 300, 150, 100));
+    QCOMPARE(e->geometry(), QRectF(200, 400, 150, 100));
+    QCOMPARE(f->geometry(), QRectF(350, 500, 100, 100));
+    QCOMPARE(p.size(), layoutMinimumSize);
+
+    p.resize(layoutPreferredSize);
+    QCOMPARE(a->geometry(), QRectF(0, 0, 150, 100));
+    QCOMPARE(b->geometry(), QRectF(150, 100, 150, 100));
+    QCOMPARE(c->geometry(), QRectF(150, 200, 320, 100));
+    QCOMPARE(d->geometry(), QRectF(300, 300, 170, 100));
+    QCOMPARE(e->geometry(), QRectF(300, 400, 170, 100));
+    QCOMPARE(f->geometry(), QRectF(470, 500, 150, 100));
+    QCOMPARE(p.size(), layoutPreferredSize);
+
+    // Maximum size depends on simplification / fair distribution
+    // Without that, test may or may not pass, depending on the
+    // solution found by the solver at runtime.
+    p.resize(layoutMaximumSize);
+    QCOMPARE(a->geometry(), QRectF(0, 0, 200, 100));
+    QCOMPARE(b->geometry(), QRectF(200, 100, 175, 100));
+    QCOMPARE(c->geometry(), QRectF(200, 200, 350, 100));
+    QCOMPARE(d->geometry(), QRectF(375, 300, 175, 100));
+    QCOMPARE(e->geometry(), QRectF(375, 400, 175, 100));
+    QCOMPARE(f->geometry(), QRectF(550, 500, 200, 100));
+    QCOMPARE(p.size(), layoutMaximumSize);
+}
+
+void tst_QGraphicsAnchorLayout::parallel2()
+{
+    QGraphicsWidget *a = createItem(QSizeF(70.0, 100.0),
+                                    QSizeF(100.0, 100.0),
+                                    QSizeF(200.0, 100.0), "A");
+
+    QGraphicsWidget *b = createItem(QSizeF(100.0, 100.0),
+                                    QSizeF(150.0, 100.0),
+                                    QSizeF(190.0, 100.0), "B");
+
+    QGraphicsAnchorLayout *l = new QGraphicsAnchorLayout;
+    l->setContentsMargins(0, 0, 0, 0);
+
+    l->addAnchor(l, Qt::AnchorTop, a, Qt::AnchorTop);
+    l->setAnchorSpacing(l, Qt::AnchorTop, a, Qt::AnchorTop, 0);
+    l->addAnchor(a, Qt::AnchorBottom, b, Qt::AnchorTop);
+    l->setAnchorSpacing(a, Qt::AnchorBottom, b, Qt::AnchorTop, 0);
+    l->addAnchor(b, Qt::AnchorBottom, l, Qt::AnchorBottom);
+    l->setAnchorSpacing(b, Qt::AnchorBottom, l, Qt::AnchorBottom, 0);
+
+    l->addLeftAndRightAnchors(l, a);
+    l->addAnchor(l, Qt::AnchorLeft, b, Qt::AnchorLeft);
+    l->setAnchorSpacing(l, Qt::AnchorLeft, b, Qt::AnchorLeft, 0);
+    l->addAnchor(b, Qt::AnchorRight, a, Qt::AnchorRight);
+    l->setAnchorSpacing(b, Qt::AnchorRight, a, Qt::AnchorRight, 0);
+
+    QCOMPARE(l->count(), 2);
+
+    QGraphicsWidget p;
+    p.setLayout(l);
+
+    QSizeF layoutMinimumSize = l->effectiveSizeHint(Qt::MinimumSize);
+    QSizeF layoutPreferredSize = l->effectiveSizeHint(Qt::PreferredSize);
+    QSizeF layoutMaximumSize = l->effectiveSizeHint(Qt::MaximumSize);
+
+    QCOMPARE(layoutMinimumSize, QSizeF(100.0, 200.0));
+    QCOMPARE(layoutPreferredSize, QSizeF(150.0, 200.0));
+    QCOMPARE(layoutMaximumSize, QSizeF(190.0, 200.0));
+
+    p.resize(layoutMinimumSize);
+    QCOMPARE(p.size(), layoutMinimumSize);
+
+    p.resize(layoutPreferredSize);
+    QCOMPARE(p.size(), layoutPreferredSize);
+
+    p.resize(layoutMaximumSize);
+    QCOMPARE(p.size(), layoutMaximumSize);
+}
+
+void tst_QGraphicsAnchorLayout::snake()
+{
+    QGraphicsWidget *a = createItem(QSizeF(50.0, 100.0),
+                                    QSizeF(70.0, 100.0),
+                                    QSizeF(100.0, 100.0), "A");
+
+    QGraphicsWidget *b = createItem(QSizeF(10.0, 100.0),
+                                    QSizeF(20.0, 100.0),
+                                    QSizeF(40.0, 100.0), "B");
+
+    QGraphicsWidget *c = createItem(QSizeF(50.0, 100.0),
+                                    QSizeF(70.0, 100.0),
+                                    QSizeF(100.0, 100.0), "C");
+
+    QGraphicsAnchorLayout *l = new QGraphicsAnchorLayout;
+    l->setContentsMargins(0, 0, 0, 0);
+
+    l->addAnchor(l, Qt::AnchorTop, a, Qt::AnchorTop);
+    l->setAnchorSpacing(l, Qt::AnchorTop, a, Qt::AnchorTop, 0);
+    l->addAnchor(a, Qt::AnchorBottom, b, Qt::AnchorTop);
+    l->setAnchorSpacing(a, Qt::AnchorBottom, b, Qt::AnchorTop, 0);
+    l->addAnchor(b, Qt::AnchorBottom, c, Qt::AnchorTop);
+    l->setAnchorSpacing(b, Qt::AnchorBottom, c, Qt::AnchorTop, 0);
+    l->addAnchor(c, Qt::AnchorBottom, l, Qt::AnchorBottom);
+    l->setAnchorSpacing(c, Qt::AnchorBottom, l, Qt::AnchorBottom, 0);
+
+    l->addAnchor(l, Qt::AnchorLeft, a, Qt::AnchorLeft);
+    l->setAnchorSpacing(l, Qt::AnchorLeft, a, Qt::AnchorLeft, 0);
+    l->addAnchor(a, Qt::AnchorRight, b, Qt::AnchorRight);
+    l->setAnchorSpacing(a, Qt::AnchorRight, b, Qt::AnchorRight, 0);
+    l->addAnchor(b, Qt::AnchorLeft, c, Qt::AnchorLeft);
+    l->setAnchorSpacing(b, Qt::AnchorLeft, c, Qt::AnchorLeft, 0);
+    l->addAnchor(c, Qt::AnchorRight, l, Qt::AnchorRight);
+    l->setAnchorSpacing(c, Qt::AnchorRight, l, Qt::AnchorRight, 0);
+
+    QCOMPARE(l->count(), 3);
+
+    QGraphicsWidget p;
+    p.setLayout(l);
+
+    QSizeF layoutMinimumSize = l->effectiveSizeHint(Qt::MinimumSize);
+    QSizeF layoutMaximumSize = l->effectiveSizeHint(Qt::MaximumSize);
+    QSizeF layoutPreferredSize = l->effectiveSizeHint(Qt::PreferredSize);
+
+    QCOMPARE(layoutMinimumSize, QSizeF(60.0, 300.0));
+    QCOMPARE(layoutPreferredSize, QSizeF(120.0, 300.0));
+    QCOMPARE(layoutMaximumSize, QSizeF(190.0, 300.0));
+
+    p.resize(layoutMinimumSize);
+    QCOMPARE(a->geometry(), QRectF(0.0, 0.0, 50.0, 100.0));
+    QCOMPARE(b->geometry(), QRectF(10.0, 100.0, 40.0, 100.0));
+    QCOMPARE(c->geometry(), QRectF(10.0, 200.0, 50.0, 100.0));
+    QCOMPARE(p.size(), layoutMinimumSize);
+
+    p.resize(layoutPreferredSize);
+    QCOMPARE(a->geometry(), QRectF(0.0, 0.0, 70.0, 100.0));
+    QCOMPARE(b->geometry(), QRectF(50.0, 100.0, 20.0, 100.0));
+    QCOMPARE(c->geometry(), QRectF(50.0, 200.0, 70.0, 100.0));
+    QCOMPARE(p.size(), layoutPreferredSize);
+
+    p.resize(layoutMaximumSize);
+    QCOMPARE(a->geometry(), QRectF(0.0, 0.0, 100.0, 100.0));
+    QCOMPARE(b->geometry(), QRectF(90.0, 100.0, 10.0, 100.0));
+    QCOMPARE(c->geometry(), QRectF(90.0, 200.0, 100.0, 100.0));
+    QCOMPARE(p.size(), layoutMaximumSize);
+}
+
+void tst_QGraphicsAnchorLayout::snakeOppositeDirections()
+{
+    QGraphicsWidget *a = createItem(QSizeF(50.0, 100.0),
+                                    QSizeF(70.0, 100.0),
+                                    QSizeF(100.0, 100.0), "A");
+
+    QGraphicsWidget *b = createItem(QSizeF(10.0, 100.0),
+                                    QSizeF(20.0, 100.0),
+                                    QSizeF(40.0, 100.0), "B");
+
+    QGraphicsWidget *c = createItem(QSizeF(50.0, 100.0),
+                                    QSizeF(70.0, 100.0),
+                                    QSizeF(100.0, 100.0), "C");
+
+    QGraphicsAnchorLayout *l = new QGraphicsAnchorLayout;
+    l->setContentsMargins(0, 0, 0, 0);
+
+    l->addAnchor(l, Qt::AnchorTop, a, Qt::AnchorTop);
+    l->setAnchorSpacing(l, Qt::AnchorTop, a, Qt::AnchorTop, 0);
+    l->addAnchor(a, Qt::AnchorBottom, b, Qt::AnchorTop);
+    l->setAnchorSpacing(a, Qt::AnchorBottom, b, Qt::AnchorTop, 0);
+    l->addAnchor(b, Qt::AnchorBottom, c, Qt::AnchorTop);
+    l->setAnchorSpacing(b, Qt::AnchorBottom, c, Qt::AnchorTop, 0);
+    l->addAnchor(c, Qt::AnchorBottom, l, Qt::AnchorBottom);
+    l->setAnchorSpacing(c, Qt::AnchorBottom, l, Qt::AnchorBottom, 0);
+
+    l->addAnchor(l, Qt::AnchorLeft, a, Qt::AnchorLeft);
+    l->setAnchorSpacing(l, Qt::AnchorLeft, a, Qt::AnchorLeft, 0);
+
+    // Both a and c are 'pointing' to b
+    l->addAnchor(a, Qt::AnchorRight, b, Qt::AnchorRight);
+    l->setAnchorSpacing(a, Qt::AnchorRight, b, Qt::AnchorRight, 0);
+    l->addAnchor(c, Qt::AnchorLeft, b, Qt::AnchorLeft);
+    l->setAnchorSpacing(c, Qt::AnchorLeft, b, Qt::AnchorLeft, 0);
+
+    l->addAnchor(c, Qt::AnchorRight, l, Qt::AnchorRight);
+    l->setAnchorSpacing(c, Qt::AnchorRight, l, Qt::AnchorRight, 0);
+
+    QCOMPARE(l->count(), 3);
+
+    QGraphicsWidget p;
+    p.setLayout(l);
+
+    QSizeF layoutMinimumSize = l->effectiveSizeHint(Qt::MinimumSize);
+    QSizeF layoutMaximumSize = l->effectiveSizeHint(Qt::MaximumSize);
+    QSizeF layoutPreferredSize = l->effectiveSizeHint(Qt::PreferredSize);
+
+    QCOMPARE(layoutMinimumSize, QSizeF(60.0, 300.0));
+    QCOMPARE(layoutPreferredSize, QSizeF(120.0, 300.0));
+    QCOMPARE(layoutMaximumSize, QSizeF(190.0, 300.0));
+
+    p.resize(layoutMinimumSize);
+    QCOMPARE(a->geometry(), QRectF(0.0, 0.0, 50.0, 100.0));
+    QCOMPARE(b->geometry(), QRectF(10.0, 100.0, 40.0, 100.0));
+    QCOMPARE(c->geometry(), QRectF(10.0, 200.0, 50.0, 100.0));
+    QCOMPARE(p.size(), layoutMinimumSize);
+
+    p.resize(layoutPreferredSize);
+    QCOMPARE(a->geometry(), QRectF(0.0, 0.0, 70.0, 100.0));
+    QCOMPARE(b->geometry(), QRectF(50.0, 100.0, 20.0, 100.0));
+    QCOMPARE(c->geometry(), QRectF(50.0, 200.0, 70.0, 100.0));
+    QCOMPARE(p.size(), layoutPreferredSize);
+
+    p.resize(layoutMaximumSize);
+    QCOMPARE(a->geometry(), QRectF(0.0, 0.0, 100.0, 100.0));
+    QCOMPARE(b->geometry(), QRectF(90.0, 100.0, 10.0, 100.0));
+    QCOMPARE(c->geometry(), QRectF(90.0, 200.0, 100.0, 100.0));
+    QCOMPARE(p.size(), layoutMaximumSize);
+}
+
+void tst_QGraphicsAnchorLayout::fairDistribution()
+{
+    QGraphicsWidget *a = createItem(QSizeF(10.0, 100.0),
+                                    QSizeF(50.0, 100.0),
+                                    QSizeF(100.0, 100.0), "A");
+
+    QGraphicsWidget *b = createItem(QSizeF(10.0, 100.0),
+                                    QSizeF(50.0, 100.0),
+                                    QSizeF(100.0, 100.0), "B");
+
+    QGraphicsWidget *c = createItem(QSizeF(10.0, 100.0),
+                                    QSizeF(50.0, 100.0),
+                                    QSizeF(100.0, 100.0), "C");
+
+    QGraphicsWidget *d = createItem(QSizeF(60.0, 100.0),
+                                    QSizeF(165.0, 100.0),
+                                    QSizeF(600.0, 100.0), "D");
+
+
+    QGraphicsAnchorLayout *l = new QGraphicsAnchorLayout;
+    l->setContentsMargins(0, 0, 0, 0);
+
+    l->addAnchor(l, Qt::AnchorTop, a, Qt::AnchorTop);
+    l->setAnchorSpacing(l, Qt::AnchorTop, a, Qt::AnchorTop, 0);
+    l->addAnchor(a, Qt::AnchorBottom, b, Qt::AnchorTop);
+    l->setAnchorSpacing(a, Qt::AnchorBottom, b, Qt::AnchorTop, 0);
+    l->addAnchor(b, Qt::AnchorBottom, c, Qt::AnchorTop);
+    l->setAnchorSpacing(b, Qt::AnchorBottom, c, Qt::AnchorTop, 0);
+    l->addAnchor(c, Qt::AnchorBottom, d, Qt::AnchorTop);
+    l->setAnchorSpacing(c, Qt::AnchorBottom, d, Qt::AnchorTop, 0);
+    l->addAnchor(d, Qt::AnchorBottom, l, Qt::AnchorBottom);
+    l->setAnchorSpacing(d, Qt::AnchorBottom, l, Qt::AnchorBottom, 0);
+
+    l->addAnchor(l, Qt::AnchorLeft, a, Qt::AnchorLeft);
+    l->setAnchorSpacing(l, Qt::AnchorLeft, a, Qt::AnchorLeft, 0);
+    l->addAnchor(a, Qt::AnchorRight, b, Qt::AnchorLeft);
+    l->setAnchorSpacing(a, Qt::AnchorRight, b, Qt::AnchorLeft, 0);
+    l->addAnchor(b, Qt::AnchorRight, c, Qt::AnchorLeft);
+    l->setAnchorSpacing(b, Qt::AnchorRight, c, Qt::AnchorLeft, 0);
+    l->addAnchor(c, Qt::AnchorRight, l, Qt::AnchorRight);
+    l->setAnchorSpacing(c, Qt::AnchorRight, l, Qt::AnchorRight, 0);
+    l->addAnchor(l, Qt::AnchorLeft, d, Qt::AnchorLeft);
+    l->setAnchorSpacing(l, Qt::AnchorLeft, d, Qt::AnchorLeft, 0);
+    l->addAnchor(d, Qt::AnchorRight, l, Qt::AnchorRight);
+    l->setAnchorSpacing(d, Qt::AnchorRight, l, Qt::AnchorRight, 0);
+
+    QCOMPARE(l->count(), 4);
+
+    QGraphicsWidget p;
+    p.setLayout(l);
+
+    QSizeF layoutMinimumSize = l->effectiveSizeHint(Qt::MinimumSize);
+    QSizeF layoutMaximumSize = l->effectiveSizeHint(Qt::MaximumSize);
+    QSizeF layoutPreferredSize = l->effectiveSizeHint(Qt::PreferredSize);
+
+    QCOMPARE(layoutMinimumSize, QSizeF(60.0, 400.0));
+    QCOMPARE(layoutPreferredSize, QSizeF(165.0, 400.0));
+    QCOMPARE(layoutMaximumSize, QSizeF(300.0, 400.0));
+
+    p.resize(layoutMinimumSize);
+    QCOMPARE(a->geometry(), QRectF(0.0, 0.0, 20.0, 100.0));
+    QCOMPARE(b->geometry(), QRectF(20.0, 100.0, 20.0, 100.0));
+    QCOMPARE(c->geometry(), QRectF(40.0, 200.0, 20.0, 100.0));
+    QCOMPARE(d->geometry(), QRectF(0.0, 300.0, 60.0, 100.0));
+    QCOMPARE(p.size(), layoutMinimumSize);
+
+    p.resize(layoutPreferredSize);
+    QCOMPARE(a->geometry(), QRectF(0.0, 0.0, 55.0, 100.0));
+    QCOMPARE(b->geometry(), QRectF(55.0, 100.0, 55.0, 100.0));
+    QCOMPARE(c->geometry(), QRectF(110.0, 200.0, 55.0, 100.0));
+    QCOMPARE(d->geometry(), QRectF(0.0, 300.0, 165.0, 100.0));
+    QCOMPARE(p.size(), layoutPreferredSize);
+
+    p.resize(layoutMaximumSize);
+    QCOMPARE(a->geometry(), QRectF(0.0, 0.0, 100.0, 100.0));
+    QCOMPARE(b->geometry(), QRectF(100.0, 100.0, 100.0, 100.0));
+    QCOMPARE(c->geometry(), QRectF(200.0, 200.0, 100.0, 100.0));
+    QCOMPARE(d->geometry(), QRectF(0.0, 300.0, 300.0, 100.0));
+    QCOMPARE(p.size(), layoutMaximumSize);
+}
+
+void tst_QGraphicsAnchorLayout::fairDistributionOppositeDirections()
+{
+    QGraphicsWidget *a = createItem(QSizeF(10.0, 100.0),
+                                    QSizeF(50.0, 100.0),
+                                    QSizeF(100.0, 100.0), "A");
+
+    QGraphicsWidget *b = createItem(QSizeF(10.0, 100.0),
+                                    QSizeF(50.0, 100.0),
+                                    QSizeF(100.0, 100.0), "B");
+
+    QGraphicsWidget *c = createItem(QSizeF(10.0, 100.0),
+                                    QSizeF(50.0, 100.0),
+                                    QSizeF(100.0, 100.0), "C");
+
+    QGraphicsWidget *d = createItem(QSizeF(10.0, 100.0),
+                                    QSizeF(50.0, 100.0),
+                                    QSizeF(100.0, 100.0), "D");
+
+    QGraphicsWidget *e = createItem(QSizeF(60.0, 100.0),
+                                    QSizeF(220.0, 100.0),
+                                    QSizeF(600.0, 100.0), "E");
+
+
+    QGraphicsAnchorLayout *l = new QGraphicsAnchorLayout;
+    l->setContentsMargins(0, 0, 0, 0);
+
+    l->addAnchor(l, Qt::AnchorTop, a, Qt::AnchorTop);
+    l->setAnchorSpacing(l, Qt::AnchorTop, a, Qt::AnchorTop, 0);
+    l->addAnchor(a, Qt::AnchorBottom, b, Qt::AnchorTop);
+    l->setAnchorSpacing(a, Qt::AnchorBottom, b, Qt::AnchorTop, 0);
+    l->addAnchor(b, Qt::AnchorBottom, c, Qt::AnchorTop);
+    l->setAnchorSpacing(b, Qt::AnchorBottom, c, Qt::AnchorTop, 0);
+    l->addAnchor(c, Qt::AnchorBottom, d, Qt::AnchorTop);
+    l->setAnchorSpacing(c, Qt::AnchorBottom, d, Qt::AnchorTop, 0);
+    l->addAnchor(d, Qt::AnchorBottom, e, Qt::AnchorTop);
+    l->setAnchorSpacing(d, Qt::AnchorBottom, e, Qt::AnchorTop, 0);
+    l->addAnchor(e, Qt::AnchorBottom, l, Qt::AnchorBottom);
+    l->setAnchorSpacing(e, Qt::AnchorBottom, l, Qt::AnchorBottom, 0);
+
+    l->addAnchor(a, Qt::AnchorLeft, l, Qt::AnchorLeft);
+    l->setAnchorSpacing(a, Qt::AnchorLeft, l, Qt::AnchorLeft, 0);
+    l->addAnchor(b, Qt::AnchorLeft, a, Qt::AnchorRight);
+    l->setAnchorSpacing(b, Qt::AnchorLeft, a, Qt::AnchorRight, 0);
+    l->addAnchor(c, Qt::AnchorLeft, b, Qt::AnchorRight);
+    l->setAnchorSpacing(c, Qt::AnchorLeft, b, Qt::AnchorRight, 0);
+    l->addAnchor(d, Qt::AnchorLeft, c, Qt::AnchorRight);
+    l->setAnchorSpacing(d, Qt::AnchorLeft, c, Qt::AnchorRight, 0);
+    l->addAnchor(d, Qt::AnchorRight, l, Qt::AnchorRight);
+    l->setAnchorSpacing(d, Qt::AnchorRight, l, Qt::AnchorRight, 0);
+    l->addLeftAndRightAnchors(l, e);
+
+    QCOMPARE(l->count(), 5);
+
+    QGraphicsWidget p;
+    p.setLayout(l);
+
+    QSizeF layoutMinimumSize = l->effectiveSizeHint(Qt::MinimumSize);
+    QSizeF layoutMaximumSize = l->effectiveSizeHint(Qt::MaximumSize);
+    QSizeF layoutPreferredSize = l->effectiveSizeHint(Qt::PreferredSize);
+
+    QCOMPARE(layoutMinimumSize, QSizeF(60.0, 500.0));
+    QCOMPARE(layoutPreferredSize, QSizeF(220.0, 500.0));
+    QCOMPARE(layoutMaximumSize, QSizeF(400.0, 500.0));
+
+    p.resize(layoutMinimumSize);
+    QCOMPARE(a->size(), b->size());
+    QCOMPARE(a->size(), c->size());
+    QCOMPARE(a->size(), d->size());
+    QCOMPARE(e->size().width(), 4 * a->size().width());
+    QCOMPARE(p.size(), layoutMinimumSize);
+
+    p.resize(layoutPreferredSize);
+    QCOMPARE(a->size(), b->size());
+    QCOMPARE(a->size(), c->size());
+    QCOMPARE(a->size(), d->size());
+    QCOMPARE(e->size().width(), 4 * a->size().width());
+    QCOMPARE(p.size(), layoutPreferredSize);
+
+    p.resize(layoutMaximumSize);
+    QCOMPARE(a->size(), b->size());
+    QCOMPARE(a->size(), c->size());
+    QCOMPARE(a->size(), d->size());
+    QCOMPARE(e->size().width(), 4 * a->size().width());
+    QCOMPARE(p.size(), layoutMaximumSize);
+}
+
+void tst_QGraphicsAnchorLayout::proportionalPreferred()
+{
+    QSizeF min(0, 100);
+
+    QGraphicsWidget *a = createItem(min, QSizeF(10, 100), QSizeF(20, 100), "A");
+    QGraphicsWidget *b = createItem(min, QSizeF(20, 100), QSizeF(30, 100), "B");
+    QGraphicsWidget *c = createItem(min, QSizeF(14, 100), QSizeF(20, 100), "C");
+    QGraphicsWidget *d = createItem(min, QSizeF(10, 100), QSizeF(20, 100), "D");
+
+    QGraphicsAnchorLayout *l = new QGraphicsAnchorLayout;
+    l->setContentsMargins(0, 0, 0, 0);
+
+    l->addAnchor(l, Qt::AnchorTop, a, Qt::AnchorTop);
+    l->setAnchorSpacing(l, Qt::AnchorTop, a, Qt::AnchorTop, 0);
+    l->addAnchor(a, Qt::AnchorBottom, b, Qt::AnchorTop);
+    l->setAnchorSpacing(a, Qt::AnchorBottom, b, Qt::AnchorTop, 0);
+    l->addAnchor(b, Qt::AnchorBottom, c, Qt::AnchorTop);
+    l->setAnchorSpacing(b, Qt::AnchorBottom, c, Qt::AnchorTop, 0);
+    l->addAnchor(c, Qt::AnchorBottom, d, Qt::AnchorTop);
+    l->setAnchorSpacing(c, Qt::AnchorBottom, d, Qt::AnchorTop, 0);
+    l->addAnchor(d, Qt::AnchorBottom, l, Qt::AnchorBottom);
+    l->setAnchorSpacing(d, Qt::AnchorBottom, l, Qt::AnchorBottom, 0);
+
+    l->addAnchor(l, Qt::AnchorLeft, a, Qt::AnchorLeft);
+    l->setAnchorSpacing(l, Qt::AnchorLeft, a, Qt::AnchorLeft, 0);
+    l->addAnchor(l, Qt::AnchorLeft, b, Qt::AnchorLeft);
+    l->setAnchorSpacing(l, Qt::AnchorLeft, b, Qt::AnchorLeft, 0);
+    l->addAnchor(a, Qt::AnchorRight, c, Qt::AnchorLeft);
+    l->setAnchorSpacing(a, Qt::AnchorRight, c, Qt::AnchorLeft, 0);
+    l->addAnchor(a, Qt::AnchorRight, d, Qt::AnchorLeft);
+    l->setAnchorSpacing(a, Qt::AnchorRight, d, Qt::AnchorLeft, 0);
+    l->addAnchor(b, Qt::AnchorRight, l, Qt::AnchorRight);
+    l->setAnchorSpacing(b, Qt::AnchorRight, l, Qt::AnchorRight, 0);
+    l->addAnchor(c, Qt::AnchorRight, l, Qt::AnchorRight);
+    l->setAnchorSpacing(c, Qt::AnchorRight, l, Qt::AnchorRight, 0);
+    l->addAnchor(d, Qt::AnchorRight, l, Qt::AnchorRight);
+    l->setAnchorSpacing(d, Qt::AnchorRight, l, Qt::AnchorRight, 0);
+
+    QCOMPARE(l->count(), 4);
+
+    QGraphicsWidget p;
+    p.setLayout(l);
+
+    QSizeF layoutMinimumSize = l->effectiveSizeHint(Qt::MinimumSize);
+    QSizeF layoutPreferredSize = l->effectiveSizeHint(Qt::PreferredSize);
+    QSizeF layoutMaximumSize = l->effectiveSizeHint(Qt::MaximumSize);
+
+    QCOMPARE(layoutMinimumSize, QSizeF(0, 400));
+    QCOMPARE(layoutPreferredSize, QSizeF(24, 400));
+    QCOMPARE(layoutMaximumSize, QSizeF(30, 400));
+
+    p.resize(layoutMinimumSize);
+    QCOMPARE(p.size(), layoutMinimumSize);
+
+    p.resize(layoutPreferredSize);
+    QCOMPARE(c->size().width(), d->size().width());
+    QCOMPARE(p.size(), layoutPreferredSize);
+
+    p.resize(layoutMaximumSize);
+    QCOMPARE(p.size(), layoutMaximumSize);
+
+    p.resize(QSizeF(12, 400));
+
+    // Proportionality between size given and preferred size, this
+    // should be respected in this graph for (a) and (b)|(c).
+    qreal factor = 12.0 / 24.0;
+
+    QCOMPARE(c->size().width(), d->size().width());
+    QCOMPARE(a->size().width(), 10 * factor);
+    QCOMPARE(c->size().width(), 14 * factor);
+    QCOMPARE(p.size(), QSizeF(12, 400));
+}
+
+void tst_QGraphicsAnchorLayout::example()
+{
+    QSizeF min(30, 100);
+    QSizeF pref(210, 100);
+    QSizeF max(300, 100);
+
+    QGraphicsWidget *a = createItem(min, pref, max, "A");
+    QGraphicsWidget *b = createItem(min, pref, max, "B");
+    QGraphicsWidget *c = createItem(min, pref, max, "C");
+    QGraphicsWidget *d = createItem(min, pref, max, "D");
+    QGraphicsWidget *e = createItem(min, pref, max, "E");
+    QGraphicsWidget *f = createItem(QSizeF(30, 50), QSizeF(150, 50), max, "F");
+    QGraphicsWidget *g = createItem(QSizeF(30, 50), QSizeF(30, 100), max, "G");
+
+    QGraphicsAnchorLayout *l = new QGraphicsAnchorLayout;
+    l->setContentsMargins(0, 0, 0, 0);
+
+    // vertical
+    l->addAnchor(a, Qt::AnchorTop, l, Qt::AnchorTop);
+    l->setAnchorSpacing(a, Qt::AnchorTop, l, Qt::AnchorTop, 0);
+    l->addAnchor(b, Qt::AnchorTop, l, Qt::AnchorTop);
+    l->setAnchorSpacing(b, Qt::AnchorTop, l, Qt::AnchorTop, 0);
+
+    l->addAnchor(c, Qt::AnchorTop, a, Qt::AnchorBottom);
+    l->setAnchorSpacing(c, Qt::AnchorTop, a, Qt::AnchorBottom, 0);
+    l->addAnchor(c, Qt::AnchorTop, b, Qt::AnchorBottom);
+    l->setAnchorSpacing(c, Qt::AnchorTop, b, Qt::AnchorBottom, 0);
+    l->addAnchor(c, Qt::AnchorBottom, d, Qt::AnchorTop);
+    l->setAnchorSpacing(c, Qt::AnchorBottom, d, Qt::AnchorTop, 0);
+    l->addAnchor(c, Qt::AnchorBottom, e, Qt::AnchorTop);
+    l->setAnchorSpacing(c, Qt::AnchorBottom, e, Qt::AnchorTop, 0);
+
+    l->addAnchor(d, Qt::AnchorBottom, l, Qt::AnchorBottom);
+    l->setAnchorSpacing(d, Qt::AnchorBottom, l, Qt::AnchorBottom, 0);
+    l->addAnchor(e, Qt::AnchorBottom, l, Qt::AnchorBottom);
+    l->setAnchorSpacing(e, Qt::AnchorBottom, l, Qt::AnchorBottom, 0);
+
+    l->addAnchor(c, Qt::AnchorTop, f, Qt::AnchorTop);
+    l->setAnchorSpacing(c, Qt::AnchorTop, f, Qt::AnchorTop, 0);
+    l->addAnchor(c, Qt::AnchorVerticalCenter, f, Qt::AnchorBottom);
+    l->setAnchorSpacing(c, Qt::AnchorVerticalCenter, f, Qt::AnchorBottom, 0);
+    l->addAnchor(f, Qt::AnchorBottom, g, Qt::AnchorTop);
+    l->setAnchorSpacing(f, Qt::AnchorBottom, g, Qt::AnchorTop, 0);
+    l->addAnchor(c, Qt::AnchorBottom, g, Qt::AnchorBottom);
+    l->setAnchorSpacing(c, Qt::AnchorBottom, g, Qt::AnchorBottom, 0);
+
+    // horizontal
+    l->addAnchor(l, Qt::AnchorLeft, a, Qt::AnchorLeft);
+    l->setAnchorSpacing(l, Qt::AnchorLeft, a, Qt::AnchorLeft, 0);
+    l->addAnchor(l, Qt::AnchorLeft, d, Qt::AnchorLeft);
+    l->setAnchorSpacing(l, Qt::AnchorLeft, d, Qt::AnchorLeft, 0);
+    l->addAnchor(a, Qt::AnchorRight, b, Qt::AnchorLeft);
+    l->setAnchorSpacing(a, Qt::AnchorRight, b, Qt::AnchorLeft, 0);
+
+    l->addAnchor(a, Qt::AnchorRight, c, Qt::AnchorLeft);
+    l->setAnchorSpacing(a, Qt::AnchorRight, c, Qt::AnchorLeft, 0);
+    l->addAnchor(c, Qt::AnchorRight, e, Qt::AnchorLeft);
+    l->setAnchorSpacing(c, Qt::AnchorRight, e, Qt::AnchorLeft, 0);
+
+    l->addAnchor(b, Qt::AnchorRight, l, Qt::AnchorRight);
+    l->setAnchorSpacing(b, Qt::AnchorRight, l, Qt::AnchorRight, 0);
+    l->addAnchor(e, Qt::AnchorRight, l, Qt::AnchorRight);
+    l->setAnchorSpacing(e, Qt::AnchorRight, l, Qt::AnchorRight, 0);
+    l->addAnchor(d, Qt::AnchorRight, e, Qt::AnchorLeft);
+    l->setAnchorSpacing(d, Qt::AnchorRight, e, Qt::AnchorLeft, 0);
+
+    l->addAnchor(l, Qt::AnchorLeft, f, Qt::AnchorLeft);
+    l->setAnchorSpacing(l, Qt::AnchorLeft, f, Qt::AnchorLeft, 0);
+    l->addAnchor(l, Qt::AnchorLeft, g, Qt::AnchorLeft);
+    l->setAnchorSpacing(l, Qt::AnchorLeft, g, Qt::AnchorLeft, 0);
+    l->addAnchor(f, Qt::AnchorRight, g, Qt::AnchorRight);
+    l->setAnchorSpacing(f, Qt::AnchorRight, g, Qt::AnchorRight, 0);
+
+    QCOMPARE(l->count(), 7);
+
+    QGraphicsWidget p;
+    p.setLayout(l);
+
+    QSizeF layoutMinimumSize = l->effectiveSizeHint(Qt::MinimumSize);
+    QSizeF layoutMaximumSize = l->effectiveSizeHint(Qt::MaximumSize);
+    QSizeF layoutPreferredSize = l->effectiveSizeHint(Qt::PreferredSize);
+
+    QCOMPARE(layoutMinimumSize, QSizeF(90.0, 300.0));
+    QCOMPARE(layoutPreferredSize, QSizeF(510.0, 300.0));
+    QCOMPARE(layoutMaximumSize, QSizeF(570.0, 300.0));
+
+    p.resize(layoutMinimumSize);
+    QCOMPARE(p.size(), layoutMinimumSize);
+    QCOMPARE(a->size(), e->size());
+    QCOMPARE(b->size(), d->size());
+    QCOMPARE(f->size(), g->size());
+
+    p.resize(layoutPreferredSize);
+    QCOMPARE(p.size(), layoutPreferredSize);
+    QCOMPARE(a->size(), e->size());
+    QCOMPARE(b->size(), d->size());
+    QCOMPARE(f->size(), g->size());
+
+    p.resize(layoutMaximumSize);
+    QCOMPARE(p.size(), layoutMaximumSize);
+    QCOMPARE(a->size(), e->size());
+    QCOMPARE(b->size(), d->size());
+    QCOMPARE(f->size(), g->size());
+}
+
+void tst_QGraphicsAnchorLayout::setSpacing()
+{
+    QSizeF min(10, 10);
+    QSizeF pref(20, 20);
+    QSizeF max(50, 50);
+
+    QGraphicsWidget *a = createItem(min, pref, max);
+    QGraphicsWidget *b = createItem(min, pref, max);
+    QGraphicsWidget *c = createItem(min, pref, max);
+
+    QGraphicsAnchorLayout *l = new QGraphicsAnchorLayout;
+    l->addCornerAnchors(l, Qt::TopLeftCorner, a, Qt::TopLeftCorner);
+    l->addCornerAnchors(b, Qt::TopRightCorner, l, Qt::TopRightCorner);
+    l->addAnchor(a, Qt::AnchorRight, b, Qt::AnchorLeft);
+
+    l->addLeftAndRightAnchors(l, c);
+
+    l->addAnchor(a, Qt::AnchorBottom, c, Qt::AnchorTop);
+    l->addAnchor(c, Qt::AnchorBottom, l, Qt::AnchorBottom);
+
+    QGraphicsWidget *p = new QGraphicsWidget(0, Qt::Window);
+
+    p->setLayout(l);
+    l->setSpacing(1);
+
+    // don't let the style influence the test.
+    l->setContentsMargins(0, 0, 0, 0);
+
+    QGraphicsScene scene;
+    scene.addItem(p);
+    QGraphicsView *view = new QGraphicsView(&scene);
+    view->show();
+    p->show();
+
+    QApplication::processEvents();
+#ifdef Q_WS_MAC
+    QTest::qWait(200);
+#endif
+    QCOMPARE(a->geometry(), QRectF(0, 0, 20, 20));
+    QCOMPARE(b->geometry(), QRectF(21, 0, 20, 20));
+    QCOMPARE(c->geometry(), QRectF(0, 21, 41, 20));
+
+    l->setHorizontalSpacing(4);
+    QApplication::processEvents();
+    p->adjustSize();
+    QCOMPARE(a->geometry(), QRectF(0, 0, 20, 20));
+    QCOMPARE(b->geometry(), QRectF(24, 0, 20, 20));
+    QCOMPARE(c->geometry(), QRectF(0, 21, 44, 20));
+
+    l->setVerticalSpacing(0);
+    QApplication::processEvents();
+    p->adjustSize();
+    QCOMPARE(a->geometry(), QRectF(0, 0, 20, 20));
+    QCOMPARE(b->geometry(), QRectF(24, 0, 20, 20));
+    QCOMPARE(c->geometry(), QRectF(0, 20, 44, 20));
+
+}
+
+QTEST_MAIN(tst_QGraphicsAnchorLayout)
+#include "tst_qgraphicsanchorlayout.moc"
diff --git a/tests/auto/tests.xml b/tests/auto/tests.xml
index ccfc380..f197de0 100644
--- a/tests/auto/tests.xml
+++ b/tests/auto/tests.xml
@@ -128,6 +128,7 @@
         <Test name="qgraphicslayout" location="tests/auto/qgraphicslayout/tst_qgraphicslayout" />
         <Test name="qgraphicslayoutitem" location="tests/auto/qgraphicslayoutitem/tst_qgraphicslayoutitem" />
         <Test name="qgraphicslinearlayout" location="tests/auto/qgraphicslinearlayout/tst_qgraphicslinearlayout" />
+        <Test name="qgraphicsanchorlayout" location="tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout" />
         <Test name="qgraphicspixmapitem" location="tests/auto/qgraphicspixmapitem/tst_qgraphicspixmapitem" />
         <Test name="qgraphicspolygonitem" location="tests/auto/qgraphicspolygonitem/tst_qgraphicspolygonitem" />
         <Test name="qgraphicsproxywidget" location="tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget" />
@@ -538,6 +539,7 @@
             <Test id="qgraphicslayout" />
             <Test id="qgraphicslayoutitem" />
             <Test id="qgraphicslinearlayout" />
+            <Test id="qgraphicsanchorlayout" />
             <Test id="qgraphicspixmapitem" />
             <Test id="qgraphicspolygonitem" />
             <Test id="qgraphicsproxywidget" />